tradesman 1.0.9 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbaf6e8fa25fa7687c37233d7119603b178b4e26
-  data.tar.gz: e035d73141449e07f661b8f65a551842f3e381a4
+  metadata.gz: 7367633d97bb0c1c6404f5beeda0881f28d7b13b
+  data.tar.gz: 917266c0de9a26b681f03bdf32ae50eef26a97b1
 SHA512:
-  metadata.gz: 8e31c7656bb1323903c415d9d2ff8d415af06b3848f27edc3c65f2f862ef53ef59456f9abfdd7830458c2f052cc8c13bd9719c95f48a7960ac47040dbc0cd4ed
-  data.tar.gz: 9a608f0a8756d7e266125599188070f5df20fe75e9a6bd03f3f220a886af6c74e7acb41367e5ea15df46ed080aba12b068dbfbc8a071a5c2a1e692ef27bc50c8
+  metadata.gz: fcb507aa6a41d362a4f95e77da96159098245151770a474bf36de12ce6230907125824c4b6d6d5c5950a6f9fa7b6d18dadc9708db89b208cef841eccfd823ec5
+  data.tar.gz: 4c49af6cf0917573be2cd6fe876393a03678ec8d1bafc39bb0fb8a9a6337bc30031810bd2c10d988f8f93c1085110e99570b3a76b729dcc72a791ae6f9aa8077

data/README.md

@@ -211,63 +211,17 @@ end
 
 The Tradesman version is self-documenting, cruft-free, and designed for testing.
 
-## Config
 
-**Define your adapter**
+## Config
+<tt>Tradesman</tt> uses the underlying Horza configuration, so all configuration options can be set on <tt>Tradesman</tt> just like they would on <tt>Horza</tt>.
 
-Tradesman sits on top of [Horza](https://github.com/onfido/horza/), and can use any of its adapters.
+***e.g. Defining your adapter***
 
+_config/initializers/tradesman.rb_
 ```ruby
-# config/initializers/tradesman.rb
 Tradesman.configure { |config| config.adapter = :active_record }
 ```
-
-**Development Mode**
-
-Turn on development mode to help Tradesman cope with Rails' lazy-loading of classes.
-
-```ruby
-# config/initializers/tradesman.rb
-Tradesman.configure do |config|
-  config.adapter = :active_record
-  config.development_mode = Rails.env.development?
-end
-```
-
-**Model Namespaces**
-
-Lazy loading becomes more complex if your models are namespaced.
-
-Consider:
-```ruby
-module MyNamespace
-  class Employer < ActiveRecord::Base
-    has_many :users
-  end
-end
-
-module MyOtherNamespace
-  class User < ActiveRecord::Base
-    belongs_to :employer
-  end
-end
-```
-
-In order to help Tradesman lazy load these models, you need to explicitly configure any namespaces:
-
-```ruby
-# config/initializers/tradesman.rb
-Tradesman.configure do |config|
-  config.adapter = :active_record
-  config.development_mode = Rails.env.development?
-  config.namespaces = [MyNamespace, MyOtherNamespace]
-end
-```
-
-**Reset Tradesman** _(Can be done at runtime or in tests)_
-```ruby
-Tradesman.reset
-```
+For more details on configuration check out the <tt>Horza</tt> [documentation.](https://github.com/onfido/horza) 
 
 ## Mocking & Stubbing in Tests
 

data/lib/tradesman/version.rb

@@ -0,0 +1,3 @@
+module Tradesman
+  VERSION = '2.0.0'
+end

data/lib/tradesman.rb

@@ -9,22 +9,18 @@ require 'tradesman/builders/create_for_parent'
 require 'tradesman/builders/delete'
 require 'tradesman/builders/update'
 require 'tradesman/class_methods'
-require 'tradesman/configuration'
 require 'tradesman/errors'
 require 'tradesman/error_handling'
 require 'tradesman/parser'
 require 'tradesman/template'
+require 'tradesman/version'
 
 module Tradesman
-  extend Configuration
+  extend Horza::SharedConfig
 
-  class << self
-    attr_writer :configuration
-
-    def const_missing(class_name)
-      parser = ::Tradesman::Parser.new(class_name)
-      return super(class_name) unless parser.match?
-      Builders.generate_class(parser)
-    end
+  def self.const_missing(class_name)
+    parser = ::Tradesman::Parser.new(class_name)
+    return super(class_name) unless parser.match?
+    Builders.generate_class(parser)
   end
 end

data/spec/tradesman_spec.rb

@@ -13,30 +13,30 @@ else
     end
   end
 
-  module TradesmanSpec
-    class Employer < ActiveRecord::Base
-      has_many :users
-    end
 
-    class User < ActiveRecord::Base
-      belongs_to :employer
-    end
+  class Employer < ActiveRecord::Base
+    has_many :users
+  end
 
-    class StrictUser < ActiveRecord::Base
-      belongs_to :employer
+  class User < ActiveRecord::Base
+    belongs_to :employer
+  end
 
-      validates :last_name, presence: true
-    end
+  class StrictUser < ActiveRecord::Base
+    belongs_to :employer
+
+    validates :last_name, presence: true
   end
+
 end
 
 describe Tradesman do
   let(:adapter) { :active_record }
   before { Tradesman.configure { |config| config.adapter = adapter } }
   after do
-    TradesmanSpec::User.delete_all
-    TradesmanSpec::StrictUser.delete_all
-    TradesmanSpec::Employer.delete_all
+    User.delete_all
+    StrictUser.delete_all
+    Employer.delete_all
   end
 
   context '#configure' do
@@ -51,44 +51,11 @@ describe Tradesman do
       after { Tradesman.reset }
 
       it 'throws error' do
-        expect { Tradesman.adapter }.to raise_error(Tradesman::Base)
-      end
-    end
-  end
-
-  context 'namespaces' do
-    context 'when no namespaces are set' do
-      it 'does not forward namespaces to Horza' do
-        expect(Horza.configuration.namespaces.empty?).to be true
-      end
-    end
-    context 'when namespaces are set' do
-      before do
-        Tradesman.configure { |config| config.namespaces = [TradesmanSpec] }
-      end
-
-      it 'forwards namespaces to Horza' do
-        expect(Horza.configuration.namespaces).to eq [TradesmanSpec]
+        expect { Tradesman.adapter }.to raise_error(Horza::Errors::AdapterError)
       end
     end
   end
 
-  context 'development_mode' do
-    context 'when development_mode is not set' do
-      it 'does not forward namespaces to Horza' do
-        expect(Horza.configuration.development_mode).to be nil
-      end
-    end
-    context 'when namespaces are set' do
-      before do
-        Tradesman.configure { |config| config.development_mode = true }
-      end
-
-      it 'forwards namespaces to Horza' do
-        expect(Horza.configuration.development_mode).to be true
-      end
-    end
-  end
 
   context '#go' do
     context 'Create' do
@@ -145,7 +112,7 @@ describe Tradesman do
       end
 
       context 'for parent' do
-        let(:employer) { TradesmanSpec::Employer.create }
+        let(:employer) { Employer.create }
         let(:outcome) { Tradesman::CreateUserForEmployer.go(employer.id, last_name: 'Turner') }
 
         it 'creates a new record' do
@@ -198,7 +165,7 @@ describe Tradesman do
   end
 
   context 'Update' do
-    let(:user) { TradesmanSpec::User.create(last_name: 'Smith') }
+    let(:user) { User.create(last_name: 'Smith') }
     context 'when parameters are valid' do
       let(:outcome) { Tradesman::UpdateUser.go(user.id, last_name: 'Turner') }
 
@@ -213,7 +180,7 @@ describe Tradesman do
     end
 
     context 'when parameters are invalid' do
-      let(:strict_user) { TradesmanSpec::StrictUser.create(last_name: 'Smith') }
+      let(:strict_user) { StrictUser.create(last_name: 'Smith') }
       let(:outcome) { Tradesman::UpdateStrictUser.go(strict_user, last_name: nil) }
 
       it 'returns an invalid outcome' do
@@ -284,7 +251,7 @@ describe Tradesman do
 
   context 'Delete' do
     context 'when parameters are valid' do
-      let!(:user) { TradesmanSpec::User.create }
+      let!(:user) { User.create }
       let(:outcome) { Tradesman::DeleteUser.go(user) }
 
       it 'executes successfully' do
@@ -293,7 +260,7 @@ describe Tradesman do
       end
 
       it 'deletes record' do
-        expect { outcome }.to change(TradesmanSpec::User, :count).by(-1)
+        expect { outcome }.to change(User, :count).by(-1)
       end
     end
 
@@ -361,7 +328,7 @@ describe Tradesman do
       end
 
       context 'for parent' do
-        let(:employer) { TradesmanSpec::Employer.create }
+        let(:employer) { Employer.create }
         let(:outcome) { Tradesman::CreateUserForEmployer.go!(employer.id, last_name: 'Turner') }
 
         it 'creates a new record' do
@@ -382,7 +349,7 @@ describe Tradesman do
   end
 
   context 'Update' do
-    let(:user) { TradesmanSpec::User.create(last_name: 'Smith') }
+    let(:user) { User.create(last_name: 'Smith') }
     context 'when parameters are valid' do
       let(:outcome) { Tradesman::UpdateUser.go!(user.id, last_name: 'Turner') }
 
@@ -397,7 +364,7 @@ describe Tradesman do
     end
 
     context 'when parameters are invalid' do
-      let(:strict_user) { TradesmanSpec::StrictUser.create(last_name: 'Smith') }
+      let(:strict_user) { StrictUser.create(last_name: 'Smith') }
       let(:outcome) { Tradesman::UpdateStrictUser.go!(strict_user, last_name: nil) }
 
       it 'throws error' do
@@ -408,7 +375,7 @@ describe Tradesman do
 
   context 'Delete' do
     context 'when parameters are valid' do
-      let!(:user) { TradesmanSpec::User.create }
+      let!(:user) { User.create }
       let(:outcome) { Tradesman::DeleteUser.go!(user) }
 
       it 'executes successfully' do
@@ -417,7 +384,7 @@ describe Tradesman do
       end
 
       it 'deletes record' do
-        expect { outcome }.to change(TradesmanSpec::User, :count).by(-1)
+        expect { outcome }.to change(User, :count).by(-1)
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tradesman
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 2.0.0
 platform: ruby
 authors:
 - Blake Turner
@@ -9,118 +9,118 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-23 00:00:00.000000000 Z
+date: 2015-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: horza
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: tzu
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.15
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.15
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.15
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.15
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        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'
 - !ruby/object:Gem::Dependency
   name: byebug
   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: Encapsulate common application behaviour with dynamically generated classes
@@ -129,23 +129,23 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE.txt
-- README.md
-- lib/tradesman.rb
-- lib/tradesman/builders.rb
 - lib/tradesman/builders/base.rb
 - lib/tradesman/builders/create.rb
 - lib/tradesman/builders/create_for_parent.rb
 - lib/tradesman/builders/delete.rb
 - lib/tradesman/builders/update.rb
+- lib/tradesman/builders.rb
 - lib/tradesman/class_methods.rb
-- lib/tradesman/configuration.rb
 - lib/tradesman/error_handling.rb
 - lib/tradesman/errors.rb
 - lib/tradesman/mixins/existing_records_multiple_execute.rb
 - lib/tradesman/mixins/new_records_multiple_execute.rb
 - lib/tradesman/parser.rb
 - lib/tradesman/template.rb
+- lib/tradesman/version.rb
+- lib/tradesman.rb
+- LICENSE.txt
+- README.md
 - spec/builders_spec.rb
 - spec/parser_spec.rb
 - spec/spec_helper.rb
@@ -160,17 +160,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.4.6
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Tradesman dynamically generates classes with human-readble names that handle

data/lib/tradesman/configuration.rb

@@ -1,40 +0,0 @@
-module Tradesman
-  module Configuration
-    def configuration
-      @configuration ||= Config.new
-    end
-
-    def reset
-      @configuration = Config.new
-      @adapter, @adapter_map = nil, nil # Class-level cache clear
-    end
-
-    def configure
-      yield(configuration)
-    end
-
-    def adapter
-      raise ::Tradesman::Base.new('Adapter has not been configured') unless configuration.adapter
-      @adapter ||= configuration.adapter
-    end
-  end
-
-  class Config
-    attr_accessor :adapter, :namespaces
-
-    def adapter=(adapter)
-      Horza.configure { |config| config.adapter = adapter }
-      @adapter = Horza.adapter
-    end
-
-    def development_mode=(mode)
-      Horza.configure { |config| config.development_mode = mode }
-    end
-
-    def namespaces=(namespaces)
-      fail Tradesman::Base.new 'namespaces must be an array' unless namespaces.is_a? Array
-      Horza.configure { |config| config.namespaces = namespaces }
-      @namespaces = namespaces
-    end
-  end
-end