spigot 0.2.1 → 0.2.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    Mzk3YmFlOGM4MmQ1M2JkNDBmNjBjYzZmZTNmYWFkOGJjMDE5MGMyMg==
-  data.tar.gz: !binary |-
-    ZTE4ZGJjNzQyYzk2YzZhZTcwNmQxY2I2NzdmNzgyMjZkNDJmZjllYw==
+SHA1:
+  metadata.gz: 43fb252116ef08da32e804dd2cd1a5bf1272f386
+  data.tar.gz: eb143439496123d5318df58b43bb353855ed9f32
 SHA512:
-  metadata.gz: !binary |-
-    ZTUzMTM5MWQ3ZGEzYTk4ZDBmMGQ2Mzc1M2MzNGI0NjM4ODE4N2RiZjc2NGQz
-    M2FjZGQzM2JjMWQ0ZjM3Y2FkMzc0MGU4NzlhNDE2YzA4MDhiNmQwNmY5Y2U1
-    OTU4MDk2NTY0ZGEwY2IxYWI0NWVhODFlODdmNDQxNTEwZWE2ZmI=
-  data.tar.gz: !binary |-
-    OTk3ZDdkY2UwZjgxOGMxZGM1MzIwN2FjOGExZTQ4NTRkZDVmYmQ2MTM3NzBm
-    ZGRjMDI0NTg1MmU3MWNkNDgwMTM0N2VlMzU1NTE3ZTg1MzZlNTE4M2JjZmRh
-    MjdkMTY1MTZlNzhkNzZhNDgzMDZhNGZiZjgyMWY1YjFhMjk5YjA=
+  metadata.gz: 2b8c421ded53429d8569655cf014921af15656ba77479dd07e05bafde28df913022b5f591236552235980359598127b48ff234ebccc9d1ac7468c1164d8110b3
+  data.tar.gz: b08b8e03fb47aa5d5a474aca6eaa08d166fbba299e77afbd73af6e8430bbe1e9ce35c41278d18b6536f911804572acc74b9062f87ce992eae6cdfd0a253d154b

data/examples/active_record.rb

@@ -23,17 +23,13 @@ class User < ActiveRecord::Base
   include Spigot::Base
 end
 
-Spigot.define do
-  service :github do
-    resource :user do
-      id :github_id
-      login :username
-      avatar_url :image_url
-      url :profile_url
-      options do
-        primary_key :username
-      end
-    end
+Spigot.resource :user do
+  id :github_id
+  login :username
+  avatar_url :image_url
+  url :profile_url
+  options do
+    primary_key :username
   end
 end
 
@@ -47,14 +43,14 @@ puts "\nIt Returned a whole bunch of data: "
 puts "#{data.inspect[0..100]}... etc, etc, etc (#{data.keys.length} more keys received)"
 
 puts "\nWe don't want to use all of it. We can define a map on Spigot:"
-puts User.spigot(:github).map.to_hash.inspect
+puts User.spigot.map.to_hash.inspect
 puts "Each key is an attribute received from the API, and the corresponding value is our column name."
 
 puts "\nWe define our primary key in the spigot `User` options, so we know how to check if the record already exists:"
-puts User.spigot(:github).options.inspect
+puts User.spigot.options.inspect
 
 
-puts "\nWe can create a new user with one nice and easy line: `User.find_or_create_by_api(:github, data)`"
-puts User.find_or_create_by_api(:github, data).inspect
+puts "\nWe can create a new user with one nice and easy line: `User.find_or_create_by_api(data)`"
+puts User.find_or_create_by_api(data).inspect
 
 puts "\nEnjoy!"

data/lib/spigot.rb

@@ -21,6 +21,18 @@ module Spigot
     (config.map || Spigot::Map::Base.new).define(&block)
   end
 
+  def self.service(name, &block)
+    define do
+      service(name, &block)
+    end
+  end
+
+  def self.resource(name, &block)
+    define do
+      resource(name, &block)
+    end
+  end
+
   def self.configure
     yield config
   end
@@ -36,9 +48,10 @@ module Spigot
 
   def self.logger
     @log ||= Spigot.config.logger || begin
-      buffer = Logger.new(STDOUT)
-      buffer.level = $0 == 'irb' ? Logger::DEBUG : Logger::INFO
-      buffer.formatter = proc{|severity, datetime, progname, msg| "#{msg}\n"}
+      if buffer = Logger.new(STDOUT)
+        buffer.level = ($0 == 'irb' ? Logger::DEBUG : Logger::INFO)
+        buffer.formatter = proc{|severity, datetime, progname, msg| "#{msg}\n"}
+      end
       buffer
     end
   end

data/lib/spigot/active_record.rb

@@ -2,70 +2,69 @@ module Spigot
   module ActiveRecord
     module ClassMethods
 
-      ## #find_by_api(service, api_data)
+      ## #find_by_api(params)
       # Build a query based on the defined map for this resource
       # to find a single matching record in the database
       #
-      # @param service [Symbol] Service from which the data was received
-      # @param api_data [Hash] The data as received from the remote api, unformatted.
-      def find_by_api(service, api_data)
-        find_all_by_api(service, api_data).first
+      # @param params [Hash] Data as received from the api with optional service key
+      def find_by_api(params={})
+        find_all_by_api(params).first
       end
 
-      ## #find_all_by_api(service, api_data)
+      ## #find_all_by_api(params)
       # Build a query based on the defined map for this resource
       # to find all matching records in the database
       #
-      # @param service [Symbol] Service from which the data was received
-      # @param api_data [Hash] The data as received from the remote api, unformatted.
-      def find_all_by_api(service, api_data)
-        find_by_translator Translator.new(self, service, api_data)
+      # @param params [Hash] Data as received from the api with optional service key
+      def find_all_by_api(params={})
+        service, data = Spigot::Map::Service.extract(params)
+        find_by_translator Translator.new(self, service, data)
       end
 
-      ## #create_by_api(service, api_data)
+      ## #create_by_api(params)
       # Insert mapped data into the calling model's table. Does not
       # do any checks on existing content already present in the database
       #
-      # @param service [Symbol] Service from which the data was received
-      # @param api_data [Hash] The data as received from the remote api, unformatted.
-      def create_by_api(service, api_data)
-        create_by_translator Translator.new(self, service, api_data)
+      # @param params [Hash] Data as received from the api with optional service key
+      def create_by_api(params={})
+        service, data = Spigot::Map::Service.extract(params)
+        create_by_translator Translator.new(self, service, data)
       end
 
-      ## #update_by_api(service, api_data)
+      ## #update_by_api(params)
       # Queries the database to find an existing record, based on the options
       # provided to spigot. If a record is found, it updates that record
       # with any new data received by the API
       #
-      # @param service [Symbol] Service from which the data was received
-      # @param api_data [Hash] The data as received from the remote api, unformatted.
-      def update_by_api(service, api_data)
-        babel = Translator.new(self, service, api_data)
+      # @param params [Hash] Data as received from the api with optional service key
+      def update_by_api(params={})
+        service, data = Spigot::Map::Service.extract(params)
+        babel = Translator.new(self, service, data)
         record = find_by_translator(babel).first
         update_by_translator(babel, record) if record.present?
       end
 
-      ## #find_or_create_by_api(service, api_data)
+      ## #find_or_create_by_api(params)
       # Queries the database to find an existing record. If that record is found
       # simply return it, otherwise create a new record and return it. This does
       # not update any existing record. If you want that, use `create_or_update_by_api`
       #
-      # @param service [Symbol] Service from which the data was received
-      # @param api_data [Hash] The data as received from the remote api, unformatted.
-      def find_or_create_by_api(service, api_data)
-        babel = Translator.new(self, service, api_data)
+      # @param params [Hash] Data as received from the api with optional service key
+      def find_or_create_by_api(params={})
+        service, data = Spigot::Map::Service.extract(params)
+        babel = Translator.new(self, service, data)
         find_by_translator(babel).first || create_by_translator(babel)
       end
 
-      ## #create_or_update_by_api(service, api_data)
+      ## #create_or_update_by_api(params)
       # Queries the database to find an existing record. If that record is found
       # it updates it with passed api_data and returns the record. Otherwise it
       # creates a new record and returns the newly created record.
       #
-      # @param service [Symbol] Service from which the data was received
-      # @param api_data [Hash] The data as received from the remote api, unformatted.
-      def create_or_update_by_api(service, api_data)
-        babel = Translator.new(self, service, api_data)
+      # @param params [Hash] Data as received from the api with optional service key
+      def create_or_update_by_api(params={})
+        service, data = Spigot::Map::Service.extract(params)
+        babel = Translator.new(self, service, data)
         record = find_by_translator(babel).first
         record.present? ? update_by_translator(babel, record) : create_by_translator(babel)
       end

data/lib/spigot/base.rb

@@ -7,30 +7,29 @@ module Spigot
     end
 
     module ClassMethods
-      # #self.new_by_api(service, api_data)
+      # #self.new_by_api(params)
       # Instantiate a new object mapping the api data to the calling object's attributes
       #
-      # @param service [Symbol] Service which will be doing the translating. Must have a corresponding yaml file
-      # @param api_data [Hash] The data as received from the remote api, unformatted.
-      def new_by_api(service, api_data)
-        Record.instantiate(self, formatted_api_data(service, api_data))
+      # @param params [Hash] Data as received from the api with optional service key
+      def new_by_api(params)
+        Record.instantiate(self, formatted_api_data(params))
       end
 
-      # #self.formatted_api_data(service, api_data)
+      # #self.formatted_api_data(params)
       # Create a Spigot::Translator for the given service and return the formatted data.
       #
-      # @param service [Symbol] Service which will be doing the translating. Must have a corresponding yaml file
-      # @param api_data [Hash] The data as received from the remote api, unformatted.
-      def formatted_api_data(service, api_data)
-        Translator.new(self, service, api_data).format
+      # @param params [Hash] Data as received from the api with optional service key
+      def formatted_api_data(params={})
+        service, data = Spigot::Map::Service.extract(params)
+        Translator.new(self, service, data).format
       end
 
       # #self.spigot
       # Return a Spigot::Proxy that provides accessor methods to the spigot library
       #
       # @param service [Symbol] Service which pertains to the data being processed on the implementation
-      def spigot(service)
-        Spigot::Proxy.new(service, self)
+      def spigot(service=nil)
+        Spigot::Proxy.new(self, service)
       end
     end
 

data/lib/spigot/map/service.rb

@@ -36,6 +36,18 @@
         resources.detect{|r| r.instance_variable_get(:@name).to_sym == name.to_sym}
       end
 
+      def self.extract(params)
+        return params if current_map.nil?
+        name    = params.keys.first
+        service = current_map.service(name)
+
+        if service.nil?
+          return [nil, params]
+        else
+          return [service.name.to_sym, params[name]]
+        end
+      end
+
       private
 
       def self.current_map

data/lib/spigot/proxy.rb

@@ -13,16 +13,51 @@ module Spigot
     #
     # @param service [String] This is the service that dictates the proxy.
     # @param resource [Object] This is the class implementing the proxy.
-    def initialize(service, resource)
-      raise MissingServiceError, "No service definition found for #{service}" if Spigot.config.map.service(service).nil?
+    def initialize(resource, service=nil)
       @service  = service
       @resource = resource
     end
 
+    ## #find
+    #  Alias for find_by_api
+    def find(params={})
+      resource.find_by_api(service_scoped(params))
+    end
+
+    ## #find_all
+    #  Alias for find_all_by_api
+    def find_all(params={})
+      resource.find_all_by_api(service_scoped(params))
+    end
+
+    ## #create
+    #  Alias for create_by_api
+    def create(params={})
+      resource.create_by_api(service_scoped(params))
+    end
+
+    ## #update
+    #  Alias for update_by_api
+    def update(params={})
+      resource.update_by_api(service_scoped(params))
+    end
+
+    ## #find_or_create
+    #  Alias for find_or_create_by_api
+    def find_or_create(params={})
+      resource.find_or_create_by_api(service_scoped(params))
+    end
+
+    ## #create_or_update
+    #  Alias for create_or_update_by_api
+    def create_or_update(params={})
+      resource.create_or_update_by_api(service_scoped(params))
+    end
+
     ## #translator
     # Instantiate a Spigot::Translator object with the contextual service and resource
     def translator
-      Translator.new(service, resource)
+      Translator.new(resource, service)
     end
 
     ## #map
@@ -37,5 +72,19 @@ module Spigot
       translator.options || {}
     end
 
+    private
+
+    def service_scoped(params={})
+      return params if @service.nil?
+      return {@service => params} if Spigot.config.map.nil?
+
+      key, data = Spigot::Map::Service.extract(params)
+      return {@service => params} if key.nil?
+
+      raise Spigot::InvalidServiceError, "You cannot specify two services" if key.to_sym != @service.to_sym
+
+      {key => data}
+    end
+
   end
 end

data/lib/spigot/translator.rb

@@ -86,7 +86,7 @@ module Spigot
       return @resource_map if defined?(@resource_map)
       resource_key = resource.to_s.underscore
       @resource_map = service_map[resource_key]
-      raise MissingResourceError, "There is no #{resource_key} resource_map for #{service}" if @resource_map.nil?
+      raise MissingResourceError, "There is no #{resource_key} resource_map" if @resource_map.nil?
       @resource_map
     end
 
@@ -107,7 +107,7 @@ module Spigot
       @service_map = Spigot.config.map.service(service || :any)
       if @service_map.nil?
         if service.nil?
-          raise MissingResourceError, "There is no #{resource_key} resource_map"
+          raise MissingResourceError, "There is no #{resource.to_s.underscore} resource_map"
         else
           raise InvalidServiceError, "No definition found for #{service}"
         end

data/lib/spigot/version.rb

@@ -1,3 +1,3 @@
 module Spigot
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/script/console.rb

@@ -1,32 +1,29 @@
 require 'active_record'
 require 'spigot'
 
-Spigot.define do
-  service :github do
-    resource :active_user do
-      id        :github_id
-      full_name :name
-      login     :username
-      contact do
-        address   :address
-        telephone do
-          work :work_phone
-          home :home_phone
-        end
-        url :homepage do |value|
-          "https://github.com/#{value}"
-        end
-      end
+Spigot.resource(:active_user) do
+  id        :github_id
+  full_name :name
+  login     :username
+  contact do
+    address   :address
+    telephone do
+      work :work_phone
+      home :home_phone
     end
-
-    resource :pull_request do
-      id        :id
-      title     :title
-      body      :body
+    url :homepage do |value|
+      "https://github.com/#{value}"
     end
   end
 end
 
+Spigot.service(:twitter) do
+  resource :active_user do
+    name      :name
+    username  :username
+  end
+end
+
 ActiveRecord::Base.logger = Spigot.logger
 require File.join(Spigot.root, 'spec', 'support', 'active_record')
 

data/spec/fixtures/mappings/active_user_map.rb

@@ -9,6 +9,15 @@ module Spigot
         end
       end
 
+      def self.twitter
+        Spigot.service(:twitter) do
+          resource :active_user do
+            login :username
+            full_name :name
+          end
+        end
+      end
+
       def self.with_options
         template do
           login :username
@@ -44,35 +53,6 @@ module Spigot
         end
       end
 
-      # def self.basic
-      #   {'active_user' => base}
-      # end
-
-      # def self.non_unique_key
-      #   {'active_user' => base.merge('auth_token' => 'token', 'spigot' => non_unique)}
-      # end
-
-      # def self.with_invalid_options
-      #   {'active_user' => base.merge('spigot' => invalid_options)}
-      # end
-
-      # private
-
-      # def self.base
-      #   {'full_name' => 'name', 'login' => 'username'}
-      # end
-
-      # def self.options
-      #   {'primary_key' => 'username', 'foreign_key' => 'login'}
-      # end
-
-      # def self.non_unique
-      #   {'primary_key' => 'token', 'foreign_key' => 'auth_token'}
-      # end
-
-      # def self.invalid_options
-      #   {'primary_key' => 'nosuchcolumn', 'foreign_key' => 'nosuchkey'}
-      # end
     end
   end
 end

data/spec/fixtures/mappings/user_map.rb

@@ -9,6 +9,13 @@ module Spigot
         end
       end
 
+      def self.abridged
+        Spigot.resource :user do
+          full_name :name
+          login     :username
+        end
+      end
+
       def self.interpolated
         template do
           full_name :name

data/spec/spigot/active_record_spec.rb

@@ -8,7 +8,7 @@ describe Spigot::ActiveRecord do
   context 'with invalid mapping' do
     it 'requires the primary key to be accurate' do
       expect {
-        subject.find_by_api(:github, {full_name: 'Dean Martin'})
+        subject.find_by_api({full_name: 'Dean Martin'})
       }.to raise_error(Spigot::MissingResourceError)
     end
   end
@@ -21,7 +21,7 @@ describe Spigot::ActiveRecord do
       end
 
       it 'queries by the specified primary_key' do
-        subject.find_by_api(:github, data).should eq(user)
+        subject.find_by_api(github: data).should eq(user)
       end
     end
 
@@ -33,14 +33,14 @@ describe Spigot::ActiveRecord do
       end
 
       it 'returns all records matching primary key' do
-        subject.find_all_by_api(:github, 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(:github, 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')
@@ -55,7 +55,7 @@ describe Spigot::ActiveRecord do
       end
 
       it 'updates a record' do
-        record = subject.update_by_api(:github, 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
@@ -66,12 +66,12 @@ describe Spigot::ActiveRecord do
         Spigot::Mapping::ActiveUser.with_options
       end
       it 'returns an existing record' do
-        record = subject.find_or_create_by_api(:github, 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(:github, Spigot::Data::ActiveUser.alt)
+        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')
@@ -85,14 +85,14 @@ describe Spigot::ActiveRecord do
       end
 
       it 'updates an existing record' do
-        record = subject.create_or_update_by_api(:github, 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(:github, Spigot::Data::ActiveUser.alt)
+        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

@@ -7,19 +7,19 @@ describe Spigot::Base do
   context '#new_by_api' do
     it 'instantiates a record' do
       Spigot::Record.should_receive(:instantiate)
-      ActiveUser.new_by_api(:github, data)
+      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)
+      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)
+      formatted = ActiveUser.formatted_api_data(github: data)
     end
   end
 
@@ -27,12 +27,6 @@ describe Spigot::Base 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/map/service_spec.rb

@@ -54,6 +54,37 @@ describe Spigot::Map::Service do
     end
   end
 
+  context '#extract' do
+    let(:data){{a: 1}}
+    context 'with no map defined' do
+      before{ Spigot.config.reset }
+      it 'returns passed params' do
+        klass.extract(data).should eq(data)
+      end
+    end
+
+    context 'with a map defined' do
+      it 'returns a nil service when none is defined' do
+        klass.extract(data).should eq([nil, data])
+      end
+
+      it 'searches for existing service definition' do
+        Spigot.config.map.should_receive(:service).with(:a)
+        klass.extract(data)
+      end
+
+      it 'returns the correct service if present' do
+        Spigot::Mapping::ActiveUser.stub
+        klass.extract(github: data).should eq([:github, data])
+      end
+
+      it 'does not return an unmatched service' do
+        Spigot::Mapping::ActiveUser.stub
+        klass.extract(twitter: data).should eq([nil, {twitter: data}])
+      end
+    end
+  end
+
   context '.resource' do
     it 'builds a resource' do
       Spigot::Map::Resource.should_receive(:new).with(:user)

data/spec/spigot/proxy_spec.rb

@@ -0,0 +1,99 @@
+require 'spec_helper'
+
+describe Spigot::Proxy do
+
+  context '#initialize' do
+    let(:subject){Spigot::Proxy}
+    it 'accepts a service and a resource' do
+      proxy = subject.new(User, :github)
+      proxy.resource.should eq(User)
+      proxy.service.should eq(:github)
+    end
+
+    it 'does not require a service' do
+      expect {
+        subject.new(User)
+      }.to_not raise_error
+    end
+  end
+
+  context 'Active Record aliases' do
+    let(:subject){Spigot::Proxy.new(ActiveUser)}
+    it 'aliases find' do
+      ActiveUser.should_receive(:find_by_api)
+      subject.find({a: 1})
+    end
+
+    it 'aliases find_all' do
+      ActiveUser.should_receive(:find_all_by_api)
+      subject.find_all({a: 1})
+    end
+
+    it 'aliases create' do
+      ActiveUser.should_receive(:create_by_api)
+      subject.create({a: 1})
+    end
+
+    it 'aliases update' do
+      ActiveUser.should_receive(:update_by_api)
+      subject.update({a: 1})
+    end
+
+    it 'aliases find_or_create' do
+      ActiveUser.should_receive(:find_or_create_by_api)
+      subject.find_or_create({a: 1})
+    end
+
+    it 'aliases create_or_update' do
+      ActiveUser.should_receive(:create_or_update_by_api)
+      subject.create_or_update({a: 1})
+    end
+
+    context 'with a specified service' do
+      let(:subject){Spigot::Proxy.new(ActiveUser, :github)}
+      before{ Spigot::Mapping::ActiveUser.stub }
+      it 'uses the current service' do
+        ActiveUser.should_receive(:create_by_api).with({github: {a: 1}})
+        subject.create({a: 1})
+      end
+
+      it 'checks for conflicting services' do
+        Spigot::Mapping::ActiveUser.twitter
+        expect{
+          subject.create(twitter: {a: 1})
+        }.to raise_error(Spigot::InvalidServiceError)
+      end
+
+      it 'only scopes by one service if both are defined' do
+        ActiveUser.should_receive(:create_by_api).with({github: {a: 1}})
+        subject.create(github: {a: 1})
+      end
+    end
+  end
+
+  context 'instance methods' do
+    let(:subject){Spigot::Proxy.new(User, :github)}
+
+    context '.translator' do
+      it 'returns a translator object' do
+        Spigot::Translator.should_receive(:new).with(User, :github)
+        subject.translator
+      end
+    end
+
+    context '.map' do
+      it 'returns the currently defined map' do
+        Spigot::Translator.any_instance.should_receive(:resource_map)
+        subject.map
+      end
+    end
+
+    context '.options' do
+      it 'returns the current options' do
+        Spigot::Translator.any_instance.should_receive(:options)
+        subject.options
+      end
+    end
+  end
+
+end

data/spec/spigot/record_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe Spigot::Record do
+  let(:resource){User}
+  let(:data){ { a: 1 } }
+  let(:subject){ Spigot::Record.new(resource, data) }
+
+  context '#instantiate' do
+    it 'exectutes instantiate on an instance' do
+      Spigot::Record.any_instance.should_receive(:instantiate)
+      Spigot::Record.instantiate(resource, data)
+    end
+  end
+
+  context '.instantiate' do
+    it 'sends a new statement to the resource' do
+      resource.should_receive(:new).with(data)
+      subject.instantiate
+    end
+  end
+
+end

data/spec/spigot/spigot_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe Spigot do
+  let(:subject){Spigot}
+  context '#resource' do
+    it 'defines a resource' do
+      Spigot.should_receive(:define)
+      subject.resource(:user){'foo'}
+    end
+  end
+
+  context '#service' do
+    it 'defines a service' do
+      Spigot.should_receive(:define)
+      subject.service(:github){'foo'}
+    end
+
+    it 'continues a normal definition' do
+      Spigot::Map::Service.any_instance.should_receive(:resource)
+      subject.service(:github) do
+        resource(:user){ 'foo' }
+      end
+    end
+  end
+
+  context '#logger' do
+    it 'produces a logger' do
+      Logger.should_receive(:new).with(STDOUT)
+      Spigot.logger
+    end
+  end
+end

data/spec/spigot/translator_spec.rb

@@ -180,6 +180,15 @@ describe Spigot::Translator do
           expect(no_service.format).to eq({name: 'Dean Martin', username: 'classyasfuck'})
         end
       end
+
+      context 'with an abridged definition' do
+        let(:data){ Spigot::Data::User.basic }
+        let(:subject){ Spigot::Translator.new(User.new, nil, data) }
+        before{ Spigot::Mapping::User.abridged }
+        it 'reads one layer' do
+          expect(subject.format).to eq({name: 'Dean Martin', username: 'classyasfuck'})
+        end
+      end
     end
   end
 

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: spigot
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Matthew Werner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-10 00:00:00.000000000 Z
+date: 2013-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -42,84 +42,84 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Spigot provides a clean interface translating API data into context relevant
@@ -158,7 +158,6 @@ files:
 - spec/fixtures/data/post.rb
 - spec/fixtures/data/user.rb
 - spec/fixtures/mappings/active_user_map.rb
-- spec/fixtures/mappings/mappings.rb
 - spec/fixtures/mappings/post_map.rb
 - spec/fixtures/mappings/user_map.rb
 - spec/spec_helper.rb
@@ -169,6 +168,9 @@ files:
 - spec/spigot/map/definition_spec.rb
 - spec/spigot/map/resource_spec.rb
 - spec/spigot/map/service_spec.rb
+- spec/spigot/proxy_spec.rb
+- spec/spigot/record_spec.rb
+- spec/spigot/spigot_spec.rb
 - spec/spigot/translator_spec.rb
 - spec/support/active_record.rb
 - spigot.gemspec
@@ -182,17 +184,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Spigot provides a clean interface translating API data into context relevant
@@ -202,7 +204,6 @@ test_files:
 - spec/fixtures/data/post.rb
 - spec/fixtures/data/user.rb
 - spec/fixtures/mappings/active_user_map.rb
-- spec/fixtures/mappings/mappings.rb
 - spec/fixtures/mappings/post_map.rb
 - spec/fixtures/mappings/user_map.rb
 - spec/spec_helper.rb
@@ -213,5 +214,8 @@ test_files:
 - spec/spigot/map/definition_spec.rb
 - spec/spigot/map/resource_spec.rb
 - spec/spigot/map/service_spec.rb
+- spec/spigot/proxy_spec.rb
+- spec/spigot/record_spec.rb
+- spec/spigot/spigot_spec.rb
 - spec/spigot/translator_spec.rb
 - spec/support/active_record.rb

data/spec/fixtures/mappings/mappings.rb

@@ -1,7 +0,0 @@
-module Spigot
-  module Mapping
-    def self.multiple_resources
-      User.basic.merge(Post.basic)
-    end
-  end
-end