active_report 1.2.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1400a2e55695801ae3744d763719f7f12f27e74d
-  data.tar.gz: e5ccf603982e504bf4fd5f35f026664a798e6d77
+  metadata.gz: b787a1e917a1f343bac52cd6e96ef35dbbf0c32a
+  data.tar.gz: cdefb7be0ef01b92a85b1994d3d331d3c3e219b8
 SHA512:
-  metadata.gz: 309b56bb9dfa90def2489429a9f22d5e9bea72abc5094c8a6daeffacd55106b2cb7983d581e4b78cf3a0b53c0bad90a2b184c86abf67367a75ede8e87880e55a
-  data.tar.gz: 6c64e77f92103be44c2f9157699ce00433df1db28bb8a132a85e751c43883b041149505954f7a7e599daa41384e40c2902716b98db37cc8205db9da7ffe44675
+  metadata.gz: 4a0dc434e18b8d9e53be40873075675088b6c4fb02ab3cc21878e2b14bb07abbd05498ddeaa85cd8786c1286418225b0b0052aff941b363d351db09559f2b620
+  data.tar.gz: e30a08a67494a1c7233ed642ff024b11efd2e177ed26535f8ecfaef8cce6ddc9a7a38f156502557295d252ddbc02b8ccb463fc53d23e19156a111094bea89a59

data/README.md

@@ -123,8 +123,8 @@ ActiveReport::Record.export(@list, only: [:id, :item], headers: ["ID", "Task"],
  * options: CSV options to be use on parsing
 
 ```ruby
-ActiveReport::Record.import("sample.csv", User)
-ActiveReport::Record.import("sample.csv", User, except: :completed, headers: ["ID", "Task"], options: { col_sep: ";" })
+ActiveReport::Record.import("sample.csv", model: User)
+ActiveReport::Record.import("sample.csv", model: User, except: :completed, headers: ["ID", "Task"], options: { col_sep: ";" })
 ```
 
 ## Contributing

data/active_report.gemspec

@@ -19,8 +19,14 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_runtime_dependency "activerecord"
+  spec.add_runtime_dependency "activesupport"
+  spec.add_runtime_dependency "active_object"
+
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "coveralls"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "sqlite3"
+  spec.add_development_dependency "database_cleaner"
 end

data/lib/active_report.rb

@@ -1,4 +1,5 @@
 require "csv"
+require "active_object"
 require "active_report/version"
 require "active_report/array"
 require "active_report/hash"

data/lib/active_report/array.rb

@@ -30,7 +30,7 @@ class ActiveReport::Array
     CSV.foreach(@datum, @options) do |data|
       processed_datum.push(data)
     end
-    return(processed_datum.count < 2 ? processed_datum.flatten : processed_datum)
+    return(processed_datum.size < 2 ? processed_datum.flatten : processed_datum)
   end
 
 end

data/lib/active_report/hash.rb

@@ -24,13 +24,13 @@ class ActiveReport::Hash
     @except = [].push(@except).compact unless @except.is_a?(Array)
 
     CSV.generate(@options) do |csv|
-      header = @datum.first.dup.keep_if   { |k,v| @only.include?(k) }   unless @only.empty?
-      header = @datum.first.dup.delete_if { |k,v| @except.include?(k) } unless @except.empty?
-      csv << (@headers || (header || @datum.first).keys.map { |k| k.to_s.gsub("_", " ").capitalize})
+      header = @datum.first.only(@only)     unless @only.empty?
+      header = @datum.first.except(@except) unless @except.empty?
+      csv << (@headers || (header || @datum.first).keys.map { |k| k.to_s.gsub("_", " ").capitalize })
 
       @datum.each do |data|
-        cell = data.dup.keep_if   { |k,v| @only.include?(k) }   unless @only.empty?
-        cell = data.dup.delete_if { |k,v| @except.include?(k) } unless @except.empty?
+        cell = data.only(@only)     unless @only.empty?
+        cell = data.except(@except) unless @except.empty?
         csv << (cell || data).values
       end
     end
@@ -46,12 +46,12 @@ class ActiveReport::Hash
         @headers = data
       else
         processed_data = {}
-        @headers.each_with_index do |v,i|
+        @headers.each_with_index do |v, i|
           processed_data.store(v.to_s, data.fetch(i, nil) )
         end
 
-        processed_data.keep_if   { |k,v| @only.include?(k) }   unless @only.empty?
-        processed_data.delete_if { |k,v| @except.include?(k) } unless @except.empty?
+        processed_data.only!(@only)     unless @only.empty?
+        processed_data.except!(@except) unless @except.empty?
 
         processed_datum.push(processed_data)
       end

data/lib/active_report/record.rb

@@ -16,8 +16,8 @@ class ActiveReport::Record
     new(datum, only: only, except: except, headers: headers, options: options).export
   end
 
-  def self.import(datum, model: nil, only: nil, except: nil, headers: nil, options: {})
-    new(datum, model: model, only: only, except: except, headers: headers, options: options).import
+  def self.import(datum, only: nil, except: nil, headers: nil, options: {}, model: nil)
+    new(datum, only: only, except: except, headers: headers, options: options, model: model).import
   end
 
   def export
@@ -26,13 +26,13 @@ class ActiveReport::Record
     @except = (@except.is_a?(Array) ? @except : [].push(@except).compact).map(&:to_s)
 
     CSV.generate(@options) do |csv|
-      header = @datum.first.dup.keep_if   { |k,v| @only.include?(k) }   unless @only.empty?
-      header = @datum.first.dup.delete_if { |k,v| @except.include?(k) } unless @except.empty?
-      csv << (@headers || (header || @datum.first).keys.map { |k| k.to_s.gsub("_", " ").capitalize})
+      header = @datum.first.only(@only)     unless @only.empty?
+      header = @datum.first.except(@except) unless @except.empty?
+      csv << (@headers || (header || @datum.first).keys.map { |k| k.to_s.gsub("_", " ").capitalize })
 
       @datum.each do |data|
-        cell = data.dup.keep_if   { |k,v| @only.include?(k) }   unless @only.empty?
-        cell = data.dup.delete_if { |k,v| @except.include?(k) } unless @except.empty?
+        cell = data.only(@only)     unless @only.empty?
+        cell = data.except(@except) unless @except.empty?
         csv << (cell || data).values
       end
     end
@@ -44,8 +44,19 @@ class ActiveReport::Record
         "Model must be an ActiveRecord::Base object."
     end
 
-    processed_datum = ActiveReport::Hash.import(@datum, headers: @headers, options: @options)
-    processed_datum.each { |data| @model.create(data) }
+    @only   = [].push(@only).compact   unless @only.is_a?(Array)
+    @except = [].push(@except).compact unless @except.is_a?(Array)
+
+    @datum = ActiveReport::Hash.import(@datum, headers: @headers, options: @options)
+    @datum.each do |data|
+      data.transform_keys! { |k| k.to_s.downcase.gsub(" ", "_").to_sym }
+      data.except!(:id)
+
+      data.only!(@only)     unless @only.empty?
+      data.except!(@except) unless @except.empty?
+
+      @model.create(data)
+    end
   end
 
 end

data/lib/active_report/version.rb

@@ -1,3 +1,3 @@
 module ActiveReport
-  VERSION = "1.2.0"
+  VERSION = "2.0.0"
 end

metadata

@@ -1,15 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: active_report
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Juan Gomez
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-11 00:00:00.000000000 Z
+date: 2015-08-14 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
+  name: activesupport
+  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
+  name: active_object
+  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
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +108,34 @@ dependencies:
     - - ">="
       - !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'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  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: Export or import data from multiple input formats such as arrays, hashes,
   and active record or vice versa.
 email: