redis_importer 1.1.2 → 1.1.3

data/lib/redis_importer/redis_importer.rb

@@ -11,30 +11,31 @@ module RedisImporter
       self.collection = Object::const_get("#{@settings['storage_method'].camelcase}Collection").new()
       
       self.files = self.collection.files
+      self.errors = []
       self.commands = []
     end
     
     # Converts each csv file in the collection to objects, which are then saved into the redis store.
     def import
       files.each do |file|
+        save_remote_file_locally(file)
         begin
           convert_to_redis_commands(file) if class_exists?(file.to_class_name.to_sym)
-        rescue NoMethodError
-          add_errors($!)
         rescue NameError
           add_errors("#{file.name} is not matched by a class #{file.to_class_name} in the system.")
+          add_errors($!)
         end
       end
-      pipeline
+
+      pipeline if !@prevent_pipeline
     end
-    
+  
     private
 
-    attr_writer :files, :commands
+    attr_writer :files, :commands, :errors
 
     def add_errors(errors)
-      @errors ||= []
-      @errors << errors
+      self.errors << errors
     end
 
     def class_exists?(c)
@@ -42,9 +43,7 @@ module RedisImporter
     end
 
     def convert_to_redis_commands(file)
-      local_path = local_storage_path(file)
-      file.save_to(local_path)
-      convert_objects_to_redis_commands(get_objects(local_path))
+      convert_objects_to_redis_commands(get_objects(local_storage_path(file)))
     end
 
     def default_settings
@@ -57,7 +56,12 @@ module RedisImporter
     
     def convert_objects_to_redis_commands(objects)
       objects.each do |obj|
-        self.commands << obj.to_redis
+        begin
+          self.commands << obj.to_redis
+        rescue
+          @prevent_pipeline = true
+          add_errors($!)
+        end
       end
     end
     
@@ -76,8 +80,13 @@ module RedisImporter
           true
         end
       else
-        self.commands
+        add_errors("No commands")
+        false
       end
     end
+    
+    def save_remote_file_locally(file)
+      file.save_to(local_storage_path(file))
+    end
   end
 end

data/lib/redis_importer/version.rb

@@ -1,3 +1,3 @@
 module RedisImporter
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 end

data/spec/redis_importer_spec.rb

@@ -45,6 +45,11 @@ describe RedisImporter do
     @ri.errors.should include "foo.csv is not matched by a class Foo in the system."
   end
   
+  it "passes files to csv_to_object that are matched by a class in the system" do
+    @ri.import
+    @ri.errors.should_not include "person.csv is not matched by a class Person in the system."
+  end
+  
   it "passes the redis commands to the redis pipeline" do
     @ri.should_receive(:pipeline)
     @ri.import

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis_importer
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-17 00:00:00.000000000Z
+date: 2012-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2160663260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160663260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: redis_backed_model
-  requirement: &2160662760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +38,15 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *2160662760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: gem_configurator
-  requirement: &2160662260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +54,15 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *2160662260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: csv_to_object
-  requirement: &2160661800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +70,15 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160661800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: redis_pipeline
-  requirement: &2160661340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +86,15 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160661340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: aws-s3
-  requirement: &2160660880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,7 +102,12 @@ dependencies:
         version: 0.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *2160660880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.3
 description: Creates objects, converts them to Redis commands and executes the redis
   commands.
 email:
@@ -132,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Creates objects, converts them to Redis commands and executes the redis commands.