amara 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39b648a9d9d4ec8b3d696a4e3a74e3d299a4ad6e
-  data.tar.gz: 29c2865c646fdd2614d652c9cd53c8f24b2b07ad
+  metadata.gz: 7596fc5964396ba836a4a4cda6a466c228ba8d0f
+  data.tar.gz: 10376cc8986eeea646c7c22bf0bb9d06487316ac
 SHA512:
-  metadata.gz: 6dd1b533b9c6eae14e2eeb194b01be2b3594b2c9d51c2f7e4d3e178901029b982b4d4f3df93c840f32ea50fbc4bff4637ee5b1db117b358a3504e9a58532d475
-  data.tar.gz: 81a23ab2d4a75b472a3ada63f86c25bb61306da07af21fafd852a393a506037b9179b1ff9fab038f6ab3c69759d1f7cbeb1639f470f3cbafa5d6e1065deb70d7
+  metadata.gz: c7fbe2bcbf185039429c1b7d763bd118367faad6c6cc98f3ff1b55bea0b4a9c36dba6f9a7b22cd9c85f4df4ba62468c36d1faf47f97a81ce451b8a30ae3af413
+  data.tar.gz: dddf4b661e45472565d4316fe8f920161a4592c6976e6fbe89984cd76ac24aa71f85e5753bbb6dd8de82d18fbbe87b7ae2cc41dda2e31b7848579d7867808d78

data/lib/amara/api.rb

@@ -54,8 +54,8 @@ module Amara
     def base_path
       parts = self.class.name.split("::").inject([]){|a, c|
         if c != 'Amara'
-          base = c.downcase.underscore
-          a << base
+          base = c.underscore
+          a << base.tr('_','-')
           a << current_options["#{base.singularize}_id"] if current_options["#{base.singularize}_id"]
         end
         a

data/lib/amara/client.rb

@@ -7,9 +7,9 @@ module Amara
       @teams ||= ApiFactory.api('Amara::Teams', self, params, &block)
     end
 
-    # def videos(params={}, &block)
-    #   @videos ||= Videos.new(current_options.merge(args_to_options(params)), &block)
-    # end
+    def videos(params={}, &block)
+      @videos ||= ApiFactory.api('Amara::Videos', self, params, &block)
+    end
 
     def languages(params={}, &block)
       @languages ||= ApiFactory.api('Amara::Languages', self, params, &block)

data/lib/amara/connection.rb

@@ -15,22 +15,25 @@ module Amara
 
     def merge_default_options(opts={})
       headers = opts.delete(:headers) || {}
-      options = {
-        :headers => {
-          'User-Agent'   => user_agent,
-          'Accept'       => "application/json",
-          'Content-Type' => "application/json"
-        },
-        :ssl => {:verify => false},
-        :url => endpoint
-      }.merge(opts)
+      options = HashWithIndifferentAccess.new(
+        {
+          :headers => {
+            'User-Agent'   => user_agent,
+            'Accept'       => "application/json",
+            'Content-Type' => "application/json"
+          },
+          :ssl => {:verify => false},
+          :url => endpoint
+        }        
+      ).merge(opts)
       options[:headers] = options[:headers].merge(headers)
-      Amara::HEADERS.each{|k,v| options[:headers][v] = options.delete(k) if options.key?(k)}      
+      Amara::HEADERS.each{|k,v| options[:headers][v] = options.delete(k) if options.key?(k)}
       options
     end
 
     def connection(options={})
       opts = merge_default_options(options)
+      # puts "connection:\n\toptions: #{options.inspect}\n\topts: #{opts.inspect}"
       Faraday::Connection.new(opts) do |connection|
         connection.request  :url_encoded
 

data/lib/amara/teams.rb

@@ -3,12 +3,16 @@
 module Amara
   class Teams < API
 
-    def members(options={}, &block)
-      @members ||= Teams::Members.new(current_options.merge(args_to_options(options)), &block)
+    def members(params={}, &block)
+      @members ||= ApiFactory.api('Amara::Teams::Members', self, params, &block)
     end
 
-    def projects(options={}, &block)
-      @projects ||= Teams::Projects.new(current_options.merge(args_to_options(options)), &block)
+    def projects(params={}, &block)
+      @projects ||= ApiFactory.api('Amara::Teams::Projects', self, params, &block)
+    end
+
+    def safe_members(params={}, &block)
+      @safe_members ||= ApiFactory.api('Amara::Teams::SafeMembers', self, params, &block)
     end
 
   end

data/lib/amara/teams/safe_members.rb

@@ -0,0 +1,6 @@
+# -*- encoding: utf-8 -*-
+
+module Amara
+  class Teams::SafeMembers < API
+  end
+end

data/lib/amara/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
 
 module Amara
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/amara/videos.rb

@@ -9,11 +9,11 @@ module Amara
     VIDEO_ORDERING      = [:created, :title]
 
     def languages(options={}, &block)
-      @languages ||= Videos::Languages.new(current_options.merge(args_to_options(options)), &block)
+      @languages ||= ApiFactory.api('Amara::Videos::Languages', self, params, &block)
     end
 
     def urls(options={}, &block)
-      @urls ||= Videos::Urls.new(current_options.merge(args_to_options(options)), &block)
+      @urls ||= ApiFactory.api('Amara::Videos::Urls', self, params, &block)
     end
 
   end

data/lib/amara/videos/languages.rb

@@ -4,7 +4,7 @@ module Amara
   class Videos::Languages < API
 
     def subtitles(options={}, &block)
-      @subtitles ||= Videos::Languages::Subtitles.new(current_options.merge(args_to_options(options)), &block)
+      @subtitles ||= ApiFactory.api('Amara::Videos::Languages::Subtitles', self, params, &block)
     end
 
   end

data/test/client_test.rb

@@ -9,4 +9,14 @@ describe Amara::Client do
     amara.teams.wont_be_nil
   end
 
+  it "returns a videos api object" do
+    amara = Amara::Client.new
+    amara.videos.wont_be_nil
+  end
+
+  it "returns a languages api object" do
+    amara = Amara::Client.new
+    amara.languages.wont_be_nil
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amara
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Andrew Kuklewicz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-12 00:00:00.000000000 Z
+date: 2013-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -161,6 +161,7 @@ files:
 - lib/amara/teams.rb
 - lib/amara/teams/members.rb
 - lib/amara/teams/projects.rb
+- lib/amara/teams/safe_members.rb
 - lib/amara/version.rb
 - lib/amara/videos.rb
 - lib/amara/videos/languages.rb