dibber 0.3.1 → 0.4.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ODFiZTE4ZmRiMjBkNmU1M2NlNDA5NTczMzRmMDZmNWQ3YTljNjZkZQ==
+  data.tar.gz: !binary |-
+    ZmFkYWQ1NzkxM2NjMDVmMGExYTJhMTBkOTJmZTZkNTljODAwYzdjZA==
+SHA512:
+  metadata.gz: !binary |-
+    MWI4OGUyZjMxNTU2NTQzZTNhOGU3ZDM5OTY0Yjk0ZjEwOWMzNTYzOTQ5N2U1
+    MjIwNTc3MzUxMmZjZTM2ZTlhOWUxZGJkY2U5MmU4Mjc4OWFkY2MxMTVmNjU4
+    ZGMzNDFkNThjYTgwYzBkZmE0YmNiMjBkNzNjMDJmNjM0ZmQ2N2Y=
+  data.tar.gz: !binary |-
+    NmJmYTM5NjM0ZWYzNmM1MDBmMGFlMmY3ZGUwY2UyYmFhMWM2OTc1ZTFhYzU4
+    OGNlYjJhMDViMDhlNDdjY2RhYzYwODZiODRmYjExYWEyZjBjOGFlOTJlOWMy
+    YWZiYWIyOTZiMmFiMzZhMmE2MWZhNzIyYTJjMjZjOGExN2RhNDI=

data/README.rdoc

@@ -71,7 +71,7 @@ Seeder#build will not overwrite existing data unless directed to do so.
    Seeder.seed :thing
    thing.reload.colour  ----> 'black'
 
-   Seeder.seed(:thing, :overwrite => true).build
+   Seeder.seed(:thing, :overwrite => true)
    thing.reload.colour  ----> 'red'
 
 

data/lib/dibber/seeder.rb

@@ -58,7 +58,7 @@ module Dibber
       check_objects_exist
       start_log
       objects.each do |name, attributes|
-        object = klass.send(retrieval_method, name)
+        object = find_or_initialize_by(name)
         if overwrite or object.new_record?
           object.send("#{attribute_method}=", attributes) 
           unless object.save
@@ -94,8 +94,16 @@ module Dibber
       raise "No objects returned from file: #{self.class.seeds_path}#{file}" unless objects
     end
     
-    def retrieval_method
-      "find_or_initialize_by_#{name_method}"
+    def find_or_initialize_by(name)
+      if klass.exists?(name_method_sym => name)
+        klass.where(name_method_sym => name).first
+      else
+        klass.new(name_method_sym => name)
+      end
+    end
+    
+    def name_method_sym
+      name_method.to_sym
     end
 
     def self.try_to_guess_seeds_path

data/lib/dibber/version.rb

@@ -1,9 +1,12 @@
 module Dibber
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end
 
 # History
 # =======
+# 0.4.0 Removes dependency on find_or_initialize_by_name type ActiveRecord
+#       dynamic methods that are no longer supported in Rails
+# 
 # 0.3.1 Adds error messages when object save fails
 #
 # 0.3.0 Adds seed method

data/test/dibber/seeder_test.rb

@@ -7,117 +7,117 @@ require_relative 'thing'
 module Dibber
 
   class SeederTest < Test::Unit::TestCase
-    
+
     def setup
       Seeder.seeds_path = File.join(File.dirname(__FILE__), 'seeds')
     end
-    
+
     def teardown
       Thing.clear_all
     end
-    
+
     def test_process_log
       assert_kind_of(ProcessLog, Seeder.process_log)
     end
-    
+
     def test_process_log_start
       @log = Seeder.process_log
       assert(@log.raw.keys.include?(:time), 'time should be logged')
     end
-    
+
     def test_report
       test_process_log_start
       assert_equal(@log.report, Seeder.report)
     end
-    
+
     def test_monitor
       Seeder.monitor(Thing)
       assert_equal({:command => 'Thing.count', :start => Thing.count}, Seeder.process_log.raw[:things])
     end
-    
+
     def test_seeds_path
       assert_match(/test\/dibber\/seeds\/$/, Seeder.seeds_path)
     end
-    
+
     def test_objects_from
       content = YAML.load_file(thing_file_path)
       assert_equal(content, Seeder.objects_from('things.yml'))
     end
-    
+
     def test_start_log
       thing_seeder.start_log
       assert(Seeder.process_log.raw.keys.include?(:things), 'Things should be logged')
     end
-    
+
     def test_objects
       content = YAML.load_file(thing_file_path)
       assert_equal(content, thing_seeder.objects)
     end
-    
+
     def test_build_with_no_objects
       thing_seeder = Seeder.new(Thing, 'empty.yml')
       assert_raise RuntimeError do
         thing_seeder.build
       end
     end
-    
+
     def test_build
       assert_equal(0, Thing.count)
       thing_seeder.build
       assert_equal(2, Thing.count)
-      foo = Thing.find_or_initialize_by_name(:foo)
-      bar = Thing.find_or_initialize_by_name(:bar)
+      foo = Thing.find_or_initialize_by(name:  :foo)
+      bar = Thing.find_or_initialize_by(name: :bar)
       assert_equal([foo, bar], Thing.saved)
       assert_equal({'title' => 'one'}, foo.attributes)
     end
-    
+
     def test_rebuilding_does_not_overwrite
       test_build
       attributes = {'title' => 'something else'}
-      foo = Thing.find_or_initialize_by_name(:foo)
+      foo = Thing.find_or_initialize_by(name: :foo)
       foo.attributes = attributes
       foo.save
       thing_seeder.build
       assert_equal(2, Thing.count)
-      foo = Thing.find_or_initialize_by_name(:foo)
+      foo = Thing.find_or_initialize_by(name: :foo)
       assert_equal(attributes, foo.attributes)
     end
-    
+
     def test_rebuilding_does_overwrite_if_set_to
       test_build
       attributes = {'title' => 'something else'}
-      foo = Thing.find_or_initialize_by_name(:foo)
+      foo = Thing.find_or_initialize_by(name: :foo)
       foo.attributes = attributes
       foo.save
       thing_seeder(:overwrite => true).build
       assert_equal(2, Thing.count)
-      foo = Thing.find_or_initialize_by_name(:foo)
+      foo = Thing.find_or_initialize_by(name: :foo)
       assert_equal({'title' => 'one'}, foo.attributes)
-    end    
-    
+    end
+
     def test_other_method_instead_of_attributes
       thing_seeder('other_method').build
-      foo = Thing.find_or_initialize_by_name(:foo)
-      bar = Thing.find_or_initialize_by_name(:bar)
+      foo = Thing.find_or_initialize_by(name: :foo)
+      bar = Thing.find_or_initialize_by(name: :bar)
       assert_equal([foo, bar], Thing.saved)
-      assert_nil(foo.attributes)
+      assert_equal({:name=>"foo"}, foo.attributes)
       assert_equal({'title' => 'one'}, foo.other_method)
     end
-    
+
     def test_other_method_replacing_attributes_via_args
       thing_seeder(:attributes_method => 'other_method').build
-      foo = Thing.find_or_initialize_by_name(:foo)
-      bar = Thing.find_or_initialize_by_name(:bar)
+      foo = Thing.find_or_initialize_by(name: :foo)
+      bar = Thing.find_or_initialize_by(name: :bar)
       assert_equal([foo, bar], Thing.saved)
-      assert_nil(foo.attributes)
+      assert_equal({:name=>"foo"}, foo.attributes)
       assert_equal({'title' => 'one'}, foo.other_method)
     end
-    
+
     def test_alternative_name_method
       thing_seeder(:name_method => 'other_method').build
       assert_equal(2, Thing.count)
-      foo = Thing.find_or_initialize_by_other_method(:foo)
-      bar = Thing.find_or_initialize_by_other_method(:bar)
+      foo = Thing.find_or_initialize_by(other_method: :foo)
+      bar = Thing.find_or_initialize_by(other_method: :bar)
       assert_equal([foo, bar], Thing.saved)
       assert_equal({'title' => 'one'}, foo.attributes)
     end
@@ -126,8 +126,8 @@ module Dibber
       assert_equal(0, Thing.count)
       Seeder.seed(:things)
       assert_equal(2, Thing.count)
-      foo = Thing.find_or_initialize_by_name(:foo)
-      bar = Thing.find_or_initialize_by_name(:bar)
+      foo = Thing.find_or_initialize_by(name: :foo)
+      bar = Thing.find_or_initialize_by(name: :bar)
       assert_equal([foo, bar], Thing.saved)
       assert_equal({'title' => 'one'}, foo.attributes)
     end
@@ -135,8 +135,8 @@ module Dibber
      def test_seed_with_alternative_name_method
       Seeder.seed(:things, :name_method => 'other_method')
       assert_equal(2, Thing.count)
-      foo = Thing.find_or_initialize_by_other_method(:foo)
-      bar = Thing.find_or_initialize_by_other_method(:bar)
+      foo = Thing.find_or_initialize_by(other_method: :foo)
+      bar = Thing.find_or_initialize_by(other_method: :bar)
       assert_equal([foo, bar], Thing.saved)
       assert_equal({'title' => 'one'}, foo.attributes)
     end
@@ -180,16 +180,16 @@ module Dibber
       assert_equal '/some/path/db/seeds/', Seeder.seeds_path
       Dibber.send(:remove_const, :Rails)
     end
-    
-    
+
+
     private
     def thing_seeder(method = 'attributes')
       @thing_seeder = Seeder.new(Thing, 'things.yml', method)
     end
-    
+
     def thing_file_path
       File.join(File.dirname(__FILE__),'seeds', 'things.yml')
     end
   end
-  
+
 end

data/test/dibber/thing_test.rb

@@ -13,14 +13,14 @@ module Dibber
     
     def test_find_or_initialize_by_name
       @name = 'foo'
-      @thing = Thing.find_or_initialize_by_name(@name)
+      @thing = Thing.find_or_initialize_by(name: @name)
       assert_equal(@name, @thing.name)
     end
     
     def test_find_or_initialize_by_name_with_symbol
       test_find_or_initialize_by_name
       assert_equal(1, Thing.count)
-      thing = Thing.find_or_initialize_by_name(:foo)
+      thing = Thing.find_or_initialize_by(name: :foo)
       assert_equal(1, Thing.count)
       assert_equal('foo', thing.name)
     end
@@ -33,7 +33,7 @@ module Dibber
     
     def test_count
       assert_equal(0, Thing.count)
-      Thing.find_or_initialize_by_name(:thing_for_count_test)
+      Thing.find_or_initialize_by(name: :thing_for_count_test)
       assert_equal(1, Thing.count)
     end
     
@@ -52,7 +52,7 @@ module Dibber
     end
     
     def test_save_and_saved
-      thing = Thing.find_or_initialize_by_name(:thing_for_save_test)
+      thing = Thing.find_or_initialize_by(name: :thing_for_save_test)
       assert !Thing.saved.include?(thing), 'saved things should not include thing'
       assert thing.save, 'should return true on save'
       assert Thing.saved.include?(thing), 'saved things should include thing'
@@ -71,7 +71,7 @@ module Dibber
     end
     
     def test_find_or_initialize_by_other_method
-      thing = Thing.find_or_initialize_by_other_method(:something)
+      thing = Thing.find_or_initialize_by(other_method: :something)
       assert_nil(thing.name)
       assert_equal('something', thing.other_method)
     end

data/test/not_quite_active_record.rb

@@ -1,12 +1,18 @@
 # Mock ActiveRecord::Base
 class NotQuiteActiveRecord
-  attr_reader :name
-  attr_accessor :attributes
+  attr_accessor :name, :title, :other_method, :attributes
 
-  def initialize(name = nil)
-    @name = name.to_s if name
+  def initialize(args = {})
+    @attributes = args
+    extract_attributes
     self.class.members << self
   end
+  
+  def extract_attributes
+    attributes.each do |name, value|
+      self.send("#{name}=", value.to_s) if self.respond_to?(name.to_sym)
+    end
+  end
 
   def save
     self.class.saved << self if new_record?
@@ -16,39 +22,16 @@ class NotQuiteActiveRecord
   def new_record?
     !self.class.saved.include? self
   end
-
-  def self.find_or_initialize_by_name(name)
-    existing = members.select{|m| m.name == name.to_s}
-    if existing.empty?
-      new(name)
-    else
-      existing.first
-    end
-  end
-
-  def self.find_or_initialize_by_title(title)
-    existing = members.select{|m| m.title == title.to_s}
-    if existing.empty?
-      fee = new
-      fee.title = title
-      fee
-    else
-      existing.first
-    end
+  
+  def self.where(hash)
+    members.select{|m| hash.collect{|k, v| m.send(k) == v.to_s}.uniq == [true]}
   end
-
-  def self.find_or_create_by_name(name)
-    find_or_initialize_by_name(name).save
-  end
-
-  def self.find_or_initialize_by_other_method(data)
-    existing = members.select{|m| m.other_method == data.to_s}
-    if existing.empty?
-      thing = new
-      thing.other_method = data.to_s
-      thing
+  
+  def self.find_or_initialize_by(hash)
+    if exists?(hash)
+      where(hash).first
     else
-      existing.first
+      new(hash)
     end
   end
 

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: dibber
 version: !ruby/object:Gem::Version
-  version: 0.3.1
-  prerelease: 
+  version: 0.4.0
 platform: ruby
 authors:
 - Rob Nichols
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-25 00:00:00.000000000 Z
+date: 2014-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_support
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -35,72 +32,71 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- MIT-LICENSE
+- README.rdoc
+- Rakefile
 - lib/dibber.rb
-- lib/dibber/version.rb
 - lib/dibber/process_log.rb
 - lib/dibber/seeder.rb
-- MIT-LICENSE
-- Rakefile
-- README.rdoc
-- test/examples/process_logs.rb
+- lib/dibber/version.rb
+- test/dibber/process_log_test.rb
+- test/dibber/seeder_test.rb
+- test/dibber/seeds/empty.yml
+- test/dibber/seeds/things.yml
+- test/dibber/thing.rb
+- test/dibber/thing_test.rb
 - test/examples/models/admin_user.rb
-- test/examples/models/disclaimer.rb
-- test/examples/models/category.rb
 - test/examples/models/borough.rb
+- test/examples/models/category.rb
+- test/examples/models/disclaimer.rb
 - test/examples/models/fee.rb
+- test/examples/process_logs.rb
+- test/examples/seeds.rb
 - test/examples/seeds/boroughs.yml
+- test/examples/seeds/categories.yml
 - test/examples/seeds/disclaimer/documents.yml
 - test/examples/seeds/fees.yml
-- test/examples/seeds/categories.yml
-- test/examples/seeds.rb
 - test/not_quite_active_record.rb
-- test/dibber/seeder_test.rb
-- test/dibber/thing.rb
-- test/dibber/process_log_test.rb
-- test/dibber/seeds/empty.yml
-- test/dibber/seeds/things.yml
-- test/dibber/thing_test.rb
 homepage: https://github.com/reggieb/Dibber
 licenses:
 - MIT-LICENSE
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Tool for seeding database from YAML.
 test_files:
-- test/examples/process_logs.rb
 - test/examples/models/admin_user.rb
 - test/examples/models/disclaimer.rb
+- test/examples/models/fee.rb
 - test/examples/models/category.rb
 - test/examples/models/borough.rb
-- test/examples/models/fee.rb
-- test/examples/seeds/boroughs.yml
-- test/examples/seeds/disclaimer/documents.yml
-- test/examples/seeds/fees.yml
 - test/examples/seeds/categories.yml
+- test/examples/seeds/fees.yml
+- test/examples/seeds/disclaimer/documents.yml
+- test/examples/seeds/boroughs.yml
 - test/examples/seeds.rb
+- test/examples/process_logs.rb
 - test/not_quite_active_record.rb
 - test/dibber/seeder_test.rb
-- test/dibber/thing.rb
-- test/dibber/process_log_test.rb
+- test/dibber/thing_test.rb
 - test/dibber/seeds/empty.yml
 - test/dibber/seeds/things.yml
-- test/dibber/thing_test.rb
+- test/dibber/thing.rb
+- test/dibber/process_log_test.rb