spigot 0.1.0 → 0.2.0

data/spec/fixtures/mappings/post_map.rb

@@ -1,22 +1,22 @@
 module Spigot
   module Mapping
-
     class Post
 
+
       def self.basic
-        {'post' => base}
-      end
 
-      def self.namespaced
-        {'wrapper/post' => base}
+        Spigot.define do
+          service :github do
+            resource 'wrapper/post' do
+              title :title
+              body :description
+            end
+          end
+        end
+
       end
 
-      private
 
-      def self.base
-        {'title' => 'title', 'body' => 'description'}
-      end
     end
-
   end
 end

data/spec/fixtures/mappings/user_map.rb

@@ -1,59 +1,103 @@
 module Spigot
   module Mapping
-
     class User
+
       def self.basic
-        {'user' => base}
+        template do
+          full_name :name
+          login     :username
+        end
       end
 
-      def self.symbolized
-        {user: {full_name: 'name', login: 'username'}}
+      def self.interpolated
+        template do
+          full_name :name
+          login :username do |value|
+            "@#{value}"
+          end
+        end
       end
 
-      def self.nested
-        {'user' => base.merge('login' => {'email' => 'contact', 'user_name' => 'username'})}
+      def self.nested_interpolation
+        template do
+          full_name :name
+          login do
+            email      :contact
+            user_name  :username do |value|
+              "@#{value}"
+            end
+          end
+        end
       end
 
-      def self.nested_twice
-        {'user' => base.merge('login' => {
-          'contact' => {'work_email' => 'email', 'user_name' => 'username'}
-        })}
+      def self.nested
+        template do
+          full_name :name
+          login do
+            email     :contact
+            user_name :username
+          end
+        end
       end
 
-      def self.array
-        {'user' => base}
+      def self.nested_twice
+        template do
+          full_name :name
+          login do
+            last_seen_ip :ip
+            contact do
+              email     :contact
+              user_name :username
+            end
+          end
+        end
       end
 
       def self.nested_array
-        {'user' => {'account' => 'name', 'count' => 'user_count', 'users' => base}}
-      end
-
-      def self.nested_account_members
-        {'activeuser' => {'account_name' => 'name', 'url' => 'url', 'members' => {'login' => 'email', 'full_name' => 'name'}}}
+        template do
+          account :name
+          count   :user_count
+          users do
+            full_name :name
+            login :username
+          end
+        end
       end
 
       def self.with_options
-        {'user' => base.merge('spigot' => options)}
+        template do
+          full_name :name
+          login     :username
+          options do
+            primary_key :username
+            foreign_key :login
+          end
+        end
       end
 
       def self.with_conditions
-        {'user' => base.merge('spigot' => options.merge(conditions))}
+        template do
+          full_name :name
+          login     :username
+          options do
+            primary_key :username
+            foreign_key :login
+          end
+        end
       end
 
       private
 
-      def self.base
-        {'full_name' => 'name', 'login' => 'username'}
-      end
-
-      def self.options
-        {'primary_key' => 'username', 'foreign_key' => 'login'}
+      def self.template(&block)
+        Spigot.define do
+          service :github do
+            resource :user do
+              self.instance_eval(&block)
+            end
+          end
+        end
       end
 
-      def self.conditions
-        {'conditions' => 'username, name'}
-      end
     end
-
   end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require 'simplecov'
+SimpleCov.start
+
 require 'rspec'
 require 'spigot'
 require 'hashie'
@@ -20,18 +23,6 @@ module Wrapper
   Post = Class.new(Hashie::Mash)
 end
 
-def with_mapping(name, map)
-  before do
-    instance_variable_set("@prior_#{name}".to_sym, Spigot.config.translations)
-    Spigot.configure{|c| c.translations = map }
-  end
-
-  after do
-    map_cache = instance_variable_get("@prior_#{name}".to_sym)
-    Spigot.configure{|c| c.translations = map_cache }
-  end
-end
-
 RSpec.configure do |config|
   config.after(:each) do
     ActiveUser.delete_all

data/spec/spigot/active_record_spec.rb

@@ -2,48 +2,46 @@ require 'spec_helper'
 
 describe Spigot::ActiveRecord do
   let(:subject){ActiveUser}
-  let(:service){:github}
-  let(:data){ Spigot::ApiData.user.merge(id: '987') }
+  let(:data){ Spigot::Data::ActiveUser.basic.merge(id: '987') }
+  let(:user){ subject.create(name: 'Dean Martin', username: 'classyasfuck') }
 
   context 'with invalid mapping' do
-    with_mapping(:basic_active_user, Spigot::Mapping::ActiveUser.with_invalid_options)
-
-    context '#find_by_api' do
-      it 'requires the primary key to be accurate' do
-        expect {
-          subject.find_by_api(service, {full_name: 'Dean Martin'}).should_not be_nil
-        }.to raise_error(Spigot::InvalidSchemaError)
-      end
+    it 'requires the primary key to be accurate' do
+      expect {
+        subject.find_by_api(:github, {full_name: 'Dean Martin'})
+      }.to raise_error(Spigot::MissingResourceError)
     end
   end
 
   context 'with valid mapping' do
-    with_mapping(:active_user_with_options, Spigot::Mapping::ActiveUser.with_options)
-    let(:user){ subject.create(name: 'Dean Martin', username: 'classyasfuck') }
-
     context '#find_by_api' do
-      before{ user }
+      before do
+        user
+        Spigot::Mapping::ActiveUser.with_options
+      end
 
       it 'queries by the specified primary_key' do
-        subject.find_by_api(service, data).should eq(user)
+        subject.find_by_api(:github, data).should eq(user)
       end
     end
 
     context '#find_all_by_api' do
-      with_mapping(:non_unique_key, Spigot::Mapping::ActiveUser.non_unique_key)
       before do
+        Spigot::Mapping::ActiveUser.non_unique_keys
         user.update_attribute(:token, '123abc')
         subject.create(name: 'Frank Sinatra', username: 'livetilidie', token: '123abc')
       end
 
       it 'returns all records matching primary key' do
-        subject.find_all_by_api(service, data).length.should eq(2)
+        subject.find_all_by_api(:github, data).length.should eq(2)
       end
     end
 
     context '#create_by_api' do
+      before{ Spigot::Mapping::ActiveUser.with_options }
       it 'creates a record' do
-        record = subject.create_by_api(service, data)
+        record = subject.create_by_api(:github, data)
+        record.id.should_not be_nil
         record.name.should eq('Dean Martin')
         record.username.should eq('classyasfuck')
         record.token.should be_nil
@@ -51,22 +49,29 @@ describe Spigot::ActiveRecord do
     end
 
     context '#update_by_api' do
-      before{ user }
+      before do
+        user
+        Spigot::Mapping::ActiveUser.with_options
+      end
+
       it 'updates a record' do
-        record = subject.update_by_api(service, data.merge(full_name: 'Dino Baby'))
+        record = subject.update_by_api(:github, data.merge(full_name: 'Dino Baby'))
         record.name.should eq('Dino Baby')
       end
     end
 
     context '#find_or_create_by_api' do
-      before{ user }
+      before do
+        user
+        Spigot::Mapping::ActiveUser.with_options
+      end
       it 'returns an existing record' do
-        record = subject.find_or_create_by_api(service, data)
+        record = subject.find_or_create_by_api(:github, data)
         record.id.should eq(user.id)
       end
 
       it 'creates a record when none exists' do
-        record = subject.find_or_create_by_api(service, Spigot::ApiData.updated_user)
+        record = subject.find_or_create_by_api(:github, Spigot::Data::ActiveUser.alt)
         record.id.should_not eq(user.id)
         record.name.should eq('Frank Sinatra')
         record.username.should eq('livetilidie')
@@ -74,17 +79,20 @@ describe Spigot::ActiveRecord do
     end
 
     context '#create_or_update_by_api' do
-      before{ user }
+      before do
+        user
+        Spigot::Mapping::ActiveUser.with_options
+      end
 
       it 'updates an existing record' do
-        record = subject.create_or_update_by_api(service, data.merge(full_name: 'Dino Baby'))
+        record = subject.create_or_update_by_api(:github, data.merge(full_name: 'Dino Baby'))
         record.id.should eq(user.id)
         record.name.should eq('Dino Baby')
         record.username.should eq('classyasfuck')
       end
 
       it 'creates a record when none exists' do
-        record = subject.create_or_update_by_api(service, Spigot::ApiData.updated_user)
+        record = subject.create_or_update_by_api(:github, Spigot::Data::ActiveUser.alt)
         record.id.should_not eq(user.id)
         record.name.should eq('Frank Sinatra')
         record.username.should eq('livetilidie')

data/spec/spigot/base_spec.rb

@@ -1,7 +1,38 @@
 require 'spec_helper'
 
 describe Spigot::Base do
+  let(:data){Spigot::Data::User.basic}
+  before{ Spigot::Mapping::ActiveUser.stub }
 
-  
+  context '#new_by_api' do
+    it 'instantiates a record' do
+      Spigot::Record.should_receive(:instantiate)
+      ActiveUser.new_by_api(:github, data)
+    end
+  end
+
+  context '#formatted_api_data' do
+    it 'calls format on the translator' do
+      Spigot::Translator.any_instance.should_receive(:format)
+      ActiveUser.formatted_api_data(:github, data)
+    end
+
+    it 'returns formatted data' do
+      Spigot::Translator.any_instance.should_receive(:format)
+      formatted = ActiveUser.formatted_api_data(:github, data)
+    end
+  end
+
+  context '#spigot' do
+    it 'returns a spigot proxy' do
+      ActiveUser.spigot(:github).should be_a_kind_of(Spigot::Proxy)
+    end
+
+    it 'requires a valid service' do
+      expect{
+        ActiveUser.spigot(:invalid)
+      }.to raise_error(Spigot::MissingServiceError)
+    end
+  end
 
 end

data/spec/spigot/configuration_spec.rb

@@ -1,14 +1,6 @@
 require 'spec_helper'
 
 describe Spigot::Configuration do
-  before do
-    @prior_translations = Spigot.config.translations
-  end
-
-  after do
-    Spigot.configure{|c| c.translations = @prior_translations }
-  end
-
   context 'defaults' do
     it 'is a hash of default configuration' do
       expect(Spigot::Configuration.defaults).to be_kind_of(Hash)
@@ -16,14 +8,6 @@ describe Spigot::Configuration do
   end
 
   context 'access' do
-    before do
-      @previous_path = Spigot.config.path
-    end
-
-    after do
-      Spigot.configure{|config| config.path = @previous_path }
-    end
-
     it "is callable from .configure" do
       Spigot.configure do |c|
         expect(c).to be_kind_of(Spigot::Configuration)
@@ -31,20 +15,9 @@ describe Spigot::Configuration do
     end
 
     context 'options' do
-      let(:path){'/baller'}
       let(:map){{'user' => {a: 1}}}
       let(:options_key){'my_special_key'}
 
-      it "is able to set the path" do
-        Spigot.configure{|config| config.path = path }
-        expect(Spigot.config.path).to eq(path)
-      end
-
-      it "is able to set translations" do
-        Spigot.configure{|config| config.translations = map }
-        expect(Spigot.config.translations).to eq(map)
-      end
-
       it "is able to set the options_key" do
         Spigot.configure{|config| config.options_key = options_key }
         expect(Spigot.config.options_key).to eq(options_key)

data/spec/spigot/map/base_spec.rb

@@ -0,0 +1,70 @@
+require 'spec_helper'
+
+describe Spigot::Map::Base do
+  let(:subject){Spigot::Map::Base.new}
+  let(:service){Spigot::Map::Service.new(:github)}
+
+  context '#initialize' do
+    it 'initializes a services array' do
+      subject.services.should eq([])
+    end
+  end
+
+  context '.define' do
+    it 'accepts a block' do
+      Spigot::Map::Service.should_receive(:class_eval)
+      subject.define{'foo'}
+    end
+
+    it 'does not require a block' do
+      Spigot::Map::Service.should_not_receive(:class_eval)
+      subject.define
+    end
+
+    it 'works with one service' do
+      subject.define do
+        service :github
+      end
+
+      subject.services.length.should eq(1)
+    end
+
+    it 'allows multiple services' do
+      subject.define do
+        service :github
+        service :twitter
+      end
+
+      subject.services.length.should eq(2)
+    end
+
+    it 'allows multiple updates' do
+      subject.define{ service(:github) }
+      subject.define{ service(:twitter) }
+
+      subject.services.length.should eq(2)
+    end
+  end
+
+  context '.reset' do
+    it 'resets services' do
+      subject.reset
+      subject.services.should eq([])
+    end
+  end
+
+  context '.service' do
+    it 'finds an existing service' do
+      subject.update(:github, service)
+      subject.service(:github).should eq(service)
+    end
+  end
+
+  context '.to_hash' do
+    it 'returns a hash of current services' do
+      subject.update(:github, service)
+      subject.to_hash.should eq({github: {}})
+    end
+  end
+
+end