barnyard_harvester 0.0.1 → 0.0.2

data/lib/barnyard_harvester/redis.rb

@@ -18,13 +18,15 @@ module BarnyardHarvester
       @debug = args.fetch(:debug) { false }
       @log = args.fetch(:logger) { Logger.new(STDOUT) }
 
-      redis_args = @redis_settings
+      @redis_settings.delete(:db)
+
+      Resque.redis = Redis.new(@redis_settings)
 
       # This sets the database number for redis to store the cached data
-      redis_args[:db] = args[:crop_number]
+      @redis_settings[:db] = args[:crop_number]
 
       # Connect to Redis
-      @redis = Redis.new(redis_args)
+      @redis = Redis.new(@redis_settings)
 
     end
 

data/lib/barnyard_harvester/version.rb

@@ -1,3 +1,3 @@
 module BarnyardHarvester
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/barnyard_harvester.rb

@@ -8,17 +8,6 @@ module BarnyardHarvester
   CHANGE = "change"
   DELETE = "delete"
 
-  # Available Options:
-  #
-  # :crop_number (required)
-  # :debug true/1
-  # :resque_enqueue true/1 (Goes to Farmer queue)
-  #
-  # :logger_call_back (calls this function with a load of params)
-  # :data_call_back (I totally forgot what this was for)
-  # :backend (default is :redis, available are: :hash, :mongodb)
-  #
-
   DEFAULT_REDIS_SETTINGS = {:host => "localhost", :port => 6379}
 
   class Sync

data/spec/redis_spec.rb

@@ -7,6 +7,14 @@ require "json"
 
 # TODO.. Move the flush to the backend object, not here!!!!!!!!!
 
+CROP_NUMBER = 1
+
+REDIS_SETTINGS = {
+    :host => "localhost",
+    :port => 6379,
+    :db => CROP_NUMBER
+}
+
 describe BarnyardHarvester do
 
 
@@ -14,15 +22,10 @@ describe BarnyardHarvester do
 
     data = YAML::load_file file
 
-    redis_settings = {
-        :host => "localhost",
-        :port => 6379,
-    }
-
     my_logger = Logger.new(STDOUT)
     my_logger.level = Logger::INFO
 
-    h = BarnyardHarvester::Sync.new(:backend => backend, :debug => false, :crop_number => 1, :redis_settings => redis_settings, :logger => my_logger)
+    h = BarnyardHarvester::Sync.new(:backend => backend, :debug => false, :crop_number => CROP_NUMBER, :redis_settings => REDIS_SETTINGS, :logger => my_logger)
 
     h.run do
       data.each do |primary_key, value|
@@ -33,117 +36,118 @@ describe BarnyardHarvester do
     h
   end
 
-    def flush
+  def flush
 
-      r = Redis.new(:db => 1)
-
-      r.keys.each do |k|
-        r.del k
-      end
+    r = Redis.new(REDIS_SETTINGS)
 
+    r.keys.each do |k|
+      r.del k
+      #puts "deleted #{k}"
     end
 
-    before(:each) do
+  end
 
-      flush
+  before(:each) do
 
-      @crop_number = 1
+    flush
 
-      file = "spec/fixtures/data-init.yml"
+    @crop_number = 1
 
-      data = YAML::load_file file
+    file = "spec/fixtures/data-init.yml"
 
-      h = load_and_process_file(file, :redis)
+    data = YAML::load_file file
 
-      h.add_count.should eq(data.count)
-      h.delete_count.should eq(0)
-      h.change_count.should eq(0)
-      h.source_count.should eq(data.count)
-      h.cache_count.should eq(data.count)
+    h = load_and_process_file(file, :redis)
 
-    end
+    h.add_count.should eq(data.count)
+    h.delete_count.should eq(0)
+    h.change_count.should eq(0)
+    h.source_count.should eq(data.count)
+    h.cache_count.should eq(data.count)
 
-    it "test initial load of records" do
+  end
 
-      data = YAML::load_file "spec/fixtures/data-init.yml"
+  it "test initial load of records" do
 
-      redis = Redis.new(:db => 1)
+    data = YAML::load_file "spec/fixtures/data-init.yml"
 
-      data.each do |primary_key, value|
-        value.to_json.should eq(redis.get(primary_key))
-      end
+    redis = Redis.new(REDIS_SETTINGS)
 
+    data.each do |primary_key, value|
+      value.to_json.should eq(redis.get(primary_key))
     end
 
-    it "test add one record" do
+  end
+
+  it "test add one record" do
 
-      file = "spec/fixtures/data-add.yml"
-      data = YAML::load_file file
+    file = "spec/fixtures/data-add.yml"
+    data = YAML::load_file file
 
-      h = load_and_process_file(file, :redis)
+    h = load_and_process_file(file, :redis)
 
-      h.add_count.should eq(1)
-      h.delete_count.should eq(0)
-      h.change_count.should eq(0)
-      h.source_count.should eq(data.count)
-      h.cache_count.should eq(data.count)
+    h.add_count.should eq(1)
+    h.delete_count.should eq(0)
+    h.change_count.should eq(0)
+    h.source_count.should eq(data.count)
+    h.cache_count.should eq(data.count)
 
-    end
+  end
 
-    it "test change one record" do
+  it "test change one record" do
 
-      file = "spec/fixtures/data-change.yml"
+    file = "spec/fixtures/data-change.yml"
 
-      data = YAML::load_file file
+    data = YAML::load_file file
 
-      h = load_and_process_file(file, :redis)
+    h = load_and_process_file(file, :redis)
 
-      h.add_count.should eq(0)
-      h.delete_count.should eq(0)
-      h.change_count.should eq(1)
-      h.source_count.should eq(data.count)
-      h.cache_count.should eq(data.count)
+    h.add_count.should eq(0)
+    h.delete_count.should eq(0)
+    h.change_count.should eq(1)
+    h.source_count.should eq(data.count)
+    h.cache_count.should eq(data.count)
 
-    end
+  end
 
-    it "test delete one record" do
+  it "test delete one record" do
 
-      file = "spec/fixtures/data-delete.yml"
+    file = "spec/fixtures/data-delete.yml"
 
-      data = YAML::load_file file
+    data = YAML::load_file file
 
-      h = load_and_process_file(file, :redis)
+    h = load_and_process_file(file, :redis)
 
 
-      h.add_count.should eq(0)
-      h.delete_count.should eq(1)
-      h.change_count.should eq(0)
-      h.source_count.should eq(data.count)
-      h.cache_count.should eq(data.count + 1)
+    h.add_count.should eq(0)
+    h.delete_count.should eq(1)
+    h.change_count.should eq(0)
+    h.source_count.should eq(data.count)
+    h.cache_count.should eq(data.count + 1)
 
-    end
+  end
 
-    it "test delete all records and add one" do
+  it "test delete all records and add one" do
 
-      init_file = "spec/fixtures/data-init.yml"
-      init_data = YAML::load_file init_file
+    init_file = "spec/fixtures/data-init.yml"
+    init_data = YAML::load_file init_file
 
-      file = "spec/fixtures/data-delete-all-records-add-one.yml"
-      #data = YAML::load_file file
+    file = "spec/fixtures/data-delete-all-records-add-one.yml"
+    #data = YAML::load_file file
 
-      h = load_and_process_file(file, :redis)
+    h = load_and_process_file(file, :redis)
 
-      h.add_count.should eq(1)
-      h.delete_count.should eq(5)
-      h.change_count.should eq(0)
-      h.source_count.should eq(1)
-      h.cache_count.should eq(init_data.count + 1)
+    h.add_count.should eq(1)
+    h.delete_count.should eq(5)
+    h.change_count.should eq(0)
+    h.source_count.should eq(1)
+    h.cache_count.should eq(init_data.count + 1)
 
-    end
+  end
 
 
-    after(:each) do
-    end
+  after(:each) do
+  end
 
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: barnyard_harvester
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-10 00:00:00.000000000 Z
+date: 2012-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70309177353080 !ruby/object:Gem::Requirement
+  requirement: &70185021713620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70309177353080
+  version_requirements: *70185021713620
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &70309177352620 !ruby/object:Gem::Requirement
+  requirement: &70185021729120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70309177352620
+  version_requirements: *70185021729120
 - !ruby/object:Gem::Dependency
   name: crack
-  requirement: &70309177352180 !ruby/object:Gem::Requirement
+  requirement: &70185021728360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70309177352180
+  version_requirements: *70185021728360
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70309177351760 !ruby/object:Gem::Requirement
+  requirement: &70185021727680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70309177351760
+  version_requirements: *70185021727680
 - !ruby/object:Gem::Dependency
   name: uuid
-  requirement: &70309177351320 !ruby/object:Gem::Requirement
+  requirement: &70185021727000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70309177351320
+  version_requirements: *70185021727000
 description: Performs harvests on data sources and detects adds, changes and deletes.
 email:
 - supercoder@gmail.com
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: barnyard_harvester
-rubygems_version: 1.8.15
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Please check the README.md for more information.