clarify 0.9.9 → 1.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDk0Y2E4NTgyNTA0NDIyMjY2ZTk4NjkzZjBlZjg1YTk5NWJmNjVlMg==
+    MzBkMDZjYzI0OTBlMmQxYmI2NzRiY2E0NTNmNjVmNmFmMDc1MWI0YQ==
   data.tar.gz: !binary |-
-    NjJiZGU2NWJhZjY4ODFjN2Y1ODI1MWJjNmU3M2E2ODI3YjIzMTE1OQ==
+    NGI4MWVhMGQ4NmE2OGNmYmZhNGVjNjJmYzI4NTIzMWMxYjM0OTk5NA==
 SHA512:
   metadata.gz: !binary |-
-    NDVlMjNiOGU1ZDA0MDQ3Yzk3NDNmZWM0YjkwYTY4MzAwN2ExYjExMDhiYjRk
-    NmRiNDI5MzY1ZjRkNWQwOGE2OGUzNGZhMGI5YWM4NDIyNzRjODhiZmJiYWFk
-    MDkwYTM1N2IxYjFhYjQwYTE5NWU0NDg2N2VjOTkxNTQ0NTBjMGY=
+    YjA3N2ZiZjc2ZGE0NDMxNTY0ZjJlZDFiMjU2NzJlNmU4ZmI4NDllMWE2ZjFm
+    Yjk0NGE2MzY3NmY4OGMyOTc4MWE1NWEwNTZiNTk3NWE0NjNlOGQwNzc0Mjlj
+    NzA0MDUxODBkNzJmMWY4MWIzMTMwZDRhNTJmMTM0N2M2Yzg4ZmY=
   data.tar.gz: !binary |-
-    ODBmNGVkZDVmYjJjNGM1MjI4NWRmMjlhZTg4NTgzZmI2ZDg5OTk1NTM1ZmMw
-    N2YwZGM3MGU5OTAzNzcxMDQ2ODJlMzk0M2QyZGNlMjIyOGZmZDExMDkwMmEz
-    N2ExNzEwZDFjM2FlMzRhMGJkZWJlZjMzMDUzMTlmMGUyYzhmNDk=
+    NWFmNDI2MmI5MjQwNzY0ZTY0NzA2YTYwMmFhODllZTI1MjIwNzRiN2IwMDc4
+    M2M3MDM4NDQxMTQ1YTg1MWNkNmNlMGU0MDU0YWU5M2NhMmM4NGJhN2QzMzI1
+    ZWZlZjU4MDI1OGQyZjAxMDVjNGFhNmEzNmRmYmRkMTZlMGUwN2Q=

data/README.md

@@ -6,7 +6,7 @@ A gem to communicate with the ClarifyAPI.
 
 Add this line to your application's Gemfile:
 
-    gem 'clarify', require: 'clarify-ruby' 
+    gem 'clarify'
 
 And then execute:
 
@@ -23,6 +23,7 @@ Clarify.configure do |config|
   config.api_key = 'CLARIFY_API_KEY'   
   # if key in ENV   
   # config.api_key = ENV['CLARIFY_API_KEY']
+  config.version = 1  #default is latest api version
 end
 ```
 
@@ -52,8 +53,7 @@ By default, it uses the newest version of the API. If you want to use a specific
 
 ## Usage
 
-    Clarify::Bundle.new.find_all       # uses default version
-    Clarify::Bundle.new(4).find_all    # uses version 4
+    Clarify::Bundle.new.find_all       
 
 ## Contributing
 

data/lib/clarify/bundle.rb

@@ -2,13 +2,9 @@ require_relative 'request'
 
 module Clarify
   class Bundle < Request
-    
-    def initialize(version = 1)
-      super(version)
-    end
 
     def create(query={})
-      response = self.class.post("/#{self.version}/bundles",
+      response = self.class.post("/#{version_name}/bundles",
                                  query: query,
                                  headers: self.headers)
       build_response(response)
@@ -16,22 +12,22 @@ module Clarify
 
     def find(bundle_id, args={})
       raise ArgumentError, "Missing bundle id" if bundle_id.nil?
-      response = self.class.get("/#{version}/bundles/#{bundle_id}", query: args, headers: headers)
+      response = self.class.get("/#{version_name}/bundles/#{bundle_id}", query: args, headers: headers)
       build_response(response)
     end
 
     def find_all(args={})
-      response = self.class.get("/#{version}/bundles", headers: headers)
+      response = self.class.get("/#{version_name}/bundles", headers: headers)
       build_response(response)
     end
 
     def delete(bundle_id)
-      response = self.class.delete("/#{version}/bundles/#{bundle_id}", headers: headers)
+      response = self.class.delete("/#{version_name}/bundles/#{bundle_id}", headers: headers)
       build_response(response)
     end
 
     def update(bundle_id, query={})
-      response = self.class.put("/#{version}/bundles/#{bundle_id}",
+      response = self.class.put("/#{version_name}/bundles/#{bundle_id}",
                                 body: query, headers:   headers)
       build_response(response)
     end

data/lib/clarify/configuration.rb

@@ -1,8 +1,16 @@
 module Clarify
   class Configuration
-    attr_accessor :api_key    
+    
+    attr_accessor :api_key, :version_name, :version
+
     def initialize 
       @api_key = 'api key here'
+      @version = '1'  # latest version is default
     end
+
+    def version_name
+      "v#{@version}"
+    end
+
   end
 end

data/lib/clarify/metadata.rb

@@ -2,26 +2,22 @@ require_relative 'request'
 
 module Clarify
   class Metadata < Request
-    
-    def initialize(version=1)
-      super(version)
-    end
 
     def find(bundle_id)
       raise ArgumentError, "Missing bundle id" if bundle_id.nil?
-      response = self.class.get("/#{version}/bundles/#{bundle_id}/metadata", headers: headers)
+      response = self.class.get("/#{version_name}/bundles/#{bundle_id}/metadata", headers: headers)
       build_response(response)
     end
 
     def delete(bundle_id)
       raise ArgumentError, "Missing bundle id" if bundle_id.nil?
-      response = self.class.delete("/#{version}/bundles/#{bundle_id}/metadata", headers: headers)
+      response = self.class.delete("/#{version_name}/bundles/#{bundle_id}/metadata", headers: headers)
       build_response(response)
     end
 
     def update(bundle_id, data="")
       raise ArgumentError, "Missing bundle id" if bundle_id.nil?      
-      response = self.class.put("/#{version}/bundles/#{bundle_id}/metadata",
+      response = self.class.put("/#{version_name}/bundles/#{bundle_id}/metadata",
                                 body: {data: data} , headers: headers)
       build_response(response)
     end

data/lib/clarify/request.rb

@@ -12,15 +12,16 @@ module Clarify
     #uncomment below for httparty debugging
     #debug_output
 
-    attr_accessor :version, :api_key
+    attr_accessor :version_name, :api_key
 
-    def initialize(version = 1)
-      @version = "v#{version}"
-      @api_key = Clarify.configuration.api_key #old ENV['CLARIFY_API_KEY']
+    def initialize
+      @version_name = Clarify.configuration.version_name
+      @api_key = Clarify.configuration.api_key 
     end
 
     def headers
-      {"Authorization" => "Bearer #{@api_key}"}
+      {"Authorization" => "Bearer #{@api_key}",
+       "User-Agent" => "clarify-gem/#{Clarify::VERSION}/#{Gem.ruby_version.version}"}
     end
 
     def build_response(response)

data/lib/clarify/search.rb

@@ -1,12 +1,8 @@
 module Clarify
   class Search < Request
- 
-    def initialize(version="1")
-      super(version)
-    end
 
     def perform(query={})
-      response = self.class.get("/#{version}/search", query: query, headers: headers)
+      response = self.class.get("/#{version_name}/search", query: query, headers: headers)
       build_response(response)
     end
     

data/lib/clarify/track.rb

@@ -3,40 +3,36 @@ require_relative 'request'
 module Clarify
   class Track < Request
 
-    def initialize(version=1)
-      super(version) 
-    end
-
     def all(bundle_id)
       raise ArgumentError, "Missing bundle id" if bundle_id.nil?
-      response = self.class.get("/#{version}/bundles/#{bundle_id}/tracks", headers: headers)
+      response = self.class.get("/#{version_name}/bundles/#{bundle_id}/tracks", headers: headers)
       build_response(response)
     end
 
     def add(bundle_id, media_url) 
       raise ArgumentError, "Missing bundle id" if bundle_id.nil?
       raise ArgumentError, "Missing media_url" if media_url.nil?
-      response = self.class.post("/#{version}/bundles/#{bundle_id}/tracks", body: {media_url: media_url}, headers: headers)
+      response = self.class.post("/#{version_name}/bundles/#{bundle_id}/tracks", body: {media_url: media_url}, headers: headers)
       build_response(response)  
     end
 
     def delete(bundle_id, track="")
       raise ArgumentError, "Missing bundle id" if bundle_id.nil?
-      response = self.class.delete("/#{version}/bundles/#{bundle_id}/tracks", query: {track: track}, headers: headers)
+      response = self.class.delete("/#{version_name}/bundles/#{bundle_id}/tracks", query: {track: track}, headers: headers)
       build_response(response)  
     end
 
     def delete_by_id(bundle_id, track_id)
       raise ArgumentError, "Missing bundle id" if bundle_id.nil?
       raise ArgumentError, "Missing track id" if track_id.nil?
-      response = self.class.delete("/#{version}/bundles/#{bundle_id}/tracks/#{track_id}", headers: headers)
+      response = self.class.delete("/#{version_name}/bundles/#{bundle_id}/tracks/#{track_id}", headers: headers)
       build_response(response)  
     end
 
     def find(bundle_id, track_id)
       raise ArgumentError, "Missing bundle id" if bundle_id.nil?
       raise ArgumentError, "Missing track id" if track_id.nil?
-      response = self.class.get("/#{version}/bundles/#{bundle_id}/tracks/#{track_id}", headers: headers)
+      response = self.class.get("/#{version_name}/bundles/#{bundle_id}/tracks/#{track_id}", headers: headers)
       build_response(response)    
     end
 

data/lib/clarify/version.rb

@@ -1,3 +1,3 @@
 module Clarify
-  VERSION = "0.9.9"
+  VERSION = "1.0.0"
 end

data/spec/lib/clarify/configuration_spec.rb

@@ -3,12 +3,17 @@ module Clarify
     before do 
       Clarify.configure do |config|
         config.api_key = ENV['CLARIFY_API_KEY']
+        config.version = 5
       end
     end
 
     it "should set the api_key in configuration" do
       expect(Request.new.api_key).to eql(ENV['CLARIFY_API_KEY'])
     end
+
+    it "should set the version number in the configuration" do
+      expect(Request.new.version_name).to eql("v5") 
+    end
   end
 end
 

data/spec/spec_helper.rb

@@ -8,5 +8,5 @@ end
 
 
 RSpec.configure do |config|
-  #config.order = :random
+  config.order = :random
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clarify
 version: !ruby/object:Gem::Version
-  version: 0.9.9
+  version: 1.0.0
 platform: ruby
 authors:
 - rubygeek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-12 00:00:00.000000000 Z
+date: 2014-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty