lib/fastly/version.rb in fastly-1.1.4 vs lib/fastly/version.rb in fastly-1.1.5

@@ -14,29 +14,25 @@
     ##
     # :attr: name
     #
     # The name of this version.
 
-
     ##
     # :attr: active
     #
     # Whether this version is active or not.
 
-
     ##
     # :attr: locked
     #
     # Whether this version is locked or not.
 
-
     ##
     # :attr: staging
     #
     # Whether this version is in staging or not.
 
-
     ##
     # :attr: testing
     #
     # Whether this version is in testing or not.
     #
@@ -52,80 +48,82 @@
     #
     # a free form comment field
 
     # Is this Version locked
     def locked?
-      return @locked.to_i > 0
+      @locked.to_i > 0
     end
 
     # Set whether this Version is locked
     def locked=(is_locked)
-      @locked = is_locked ? "1" : "0"
+      @locked = is_locked ? '1' : '0'
     end
 
     # Get the Service object this Version belongs to
     def service
-      fetcher.get(Fastly::Service, service_id)
+      fetcher.get(Service, service_id)
     end
 
     # Get the Settings object for this Version
     def settings
       fetcher.get_settings(service_id, number)
     end
 
     # Is version active?
     def active?
-      return @active.to_i > 0
+      @active.to_i > 0
     end
 
     # Activate this version
     def activate!
-      hash = fetcher.client.put(Fastly::Version.put_path(self)+"/activate")
-      return !hash.nil?
+      hash = fetcher.client.put("#{Version.put_path(self)}/activate")
+      !hash.nil?
     end
 
     # Deactivate this version
     def deactivate!
-       hash = fetcher.client.put(Fastly::Version.put_path(self)+"/deactivate")
-       return !hash.nil?
+      hash = fetcher.client.put("#{Version.put_path(self)}/deactivate")
+      !hash.nil?
     end
 
     # Clone this Version
     def clone
-      hash = fetcher.client.put(Fastly::Version.put_path(self)+"/clone")
+      hash = fetcher.client.put("#{Version.put_path(self)}/clone")
       return nil if hash.nil?
-      return Fastly::Version.new(hash, fetcher)
+      Version.new(hash, fetcher)
     end
 
     # Create an entirely new version, not cloned from the previous one.
     def self.create_new(fetcher, opts)
-      hash = fetcher.client.post(Fastly::Version.post_path(opts))
+      hash = fetcher.client.post(Version.post_path(opts))
       return nil if hash.nil?
-      return Fastly::Version.new(hash, fetcher)
+
+      Version.new(hash, fetcher)
     end
 
     # Get the generated VCL object for this Version (which must have been activated first)
     #
     # Won't return the content of the VCL unless you pass in
     #    :include_content => true
     # in the opts
-    def generated_vcl(opts={})
-      hash = fetcher.client.get(Fastly::Version.put_path(self)+"/generated_vcl", opts)
+    def generated_vcl(opts = {})
+      hash = fetcher.client.get("#{Version.put_path(self)}/generated_vcl", opts)
       opts = {
         'content'    => hash['vcl'] || hash['content'],
         'name'       => hash['md5'],
         'version'    => hash['version'],
         'service_id' => hash['service']
       }
-      return Fastly::VCL.new(opts, fetcher)
+
+      VCL.new(opts, fetcher)
     end
 
     # Upload a VCL file for this Version
     def upload_vcl(name, content)
-      hash = fetcher.client.post(Fastly::Version.put_path(self)+"/vcl", :name => name, :content => content)
+      hash = fetcher.client.post("#{Version.put_path(self)}/vcl", name: name, content: content)
       return nil if hash.nil?
-      return Fastly::VCL.new(hash, fetcher)
+      VCL.new(hash, fetcher)
     end
 
     # Upload a VCL file for this Version and set as the main VCL
     def upload_main_vcl(name, contents)
       upload_vcl(name, contents).set_main!
@@ -134,33 +132,30 @@
     # Get the named VCL for this version
     #
     # Won't return the content of the VCL unless you pass in
     #    :include_content => true
     # in the opts
-    def vcl(name, opts={})
+    def vcl(name, opts = {})
       fetcher.get_vcl(service_id, number, name, opts)
     end
 
     # Delete a VCL file for this Version
     def delete_vcl(name)
-      hash = fetcher.client.delete(Fastly::Version.put_path(self)+"/vcl/" + name )
-      return nil if hash.nil?
-      return hash
+      hash = fetcher.client.delete("#{Version.put_path(self)}/vcl/#{name}")
+      hash.nil? ? nil : hash
     end
 
     # Validate this Version
     def validate
-      hash = fetcher.client.get(Fastly::Version.put_path(self)+"/validate")
-      return !hash.nil?
+      hash = fetcher.client.get("#{Version.put_path(self)}/validate")
+      !hash.nil?
     end
 
-    private
-
     def self.get_path(service, number)
       "/service/#{service}/version/#{number}"
     end
 
-    def self.post_path(opts)
+    def self.post_path(opts = {})
       "/service/#{opts[:service_id]}/version"
     end
 
     def self.put_path(obj)
       get_path(obj.service_id, obj.number)