swim 0.0.2 → 0.0.3

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ODc5OTZiM2FmMmFkMThjY2U4MmRmMjM5MTA5NTY0YmM5NTYwNjg1ZA==
+  data.tar.gz: !binary |-
+    OGU0ODA0MTlmNDliNWJmMWI2OWI4ZWYyNTdlMjEyMDZiNDY1YWQwZg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    OGFmM2RlOWM4YmFlZTEwNDQwM2MyNzkwYmI5OTVjY2Q2YmYyOGUxNmU3M2Y2
+    Mzc5ZjY2MTQ2NzQ1NmQ1ZGQ0Y2YyZDBmN2NlMGE4ZTkxNGE0ODI0NDY3Yzky
+    YWEyYzMyZGQ0OWMxZTY2ZGQ2YmJkYTllNmFjN2IyMDgyNmE2MWM=
+  data.tar.gz: !binary |-
+    MDdhMGQ1MDZmYTA0ZmYzNTkzNDNjMGRkMDlmZGU4MDZkNjJiN2YyNjViOGEy
+    ODczOTk4ODBkNjcwNWIwMGM0YTZjZTFmYzVkYmVkOWRmMDI4NGQ5M2Q3N2Yz
+    ODQ1Yzg0YjNiOTRkYTY5YTk2Nzg2Yjg4YWMyZTk1M2Q0OTNjMTI=

data/.gitignore

@@ -16,4 +16,5 @@ test/tmp
 test/version_tmp
 tmp
 .DS_Store
-lib/.DS_Store
+lib/.DS_Store
+.rbenv-version

data/README.md

@@ -20,19 +20,19 @@ Or install it yourself as:
 
 1. Add a settings_file instance method to your ActiveRecord class.
 
-		class Artist < ActiveRecord::Base
-			def settings_file
-				File.expand_path("/sample_files/artist_1_settings.json")
-			end
-		end
-	
+    class Artist < ActiveRecord::Base
+      def settings_file
+        File.expand_path("/sample_files/artist_1_settings.json")
+      end
+    end
+
 2. Add a sync_settings class method to your ActiveRecord class.
 
-		class Artist < ActiveRecord::Base
-		  def self.sync_settings
-		    { :albums => {} }
-		  end
-		end
+    class Artist < ActiveRecord::Base
+      def self.sync_settings
+        { :albums => {} }
+      end
+    end
 
 ## Contributing
 

data/lib/swim/change.rb

@@ -1,7 +1,7 @@
 # Class to store changes made during SyncTools' import_json_file method.
 class Swim::Change
   attr_accessor :obj_class, :obj_id, :change_type, :key, :old_value, :new_value, :status, :errors
-  
+
   def initialize(attributes = nil)
     self.obj_class   = attributes[:obj_class]
     self.obj_id      = attributes[:obj_id]
@@ -12,7 +12,7 @@ class Swim::Change
     self.status      = attributes[:status]
     self.errors      = attributes[:errors]
   end
-    
+
   def to_s
     if status.nil? || status.empty?
       verb = "would be"
@@ -27,10 +27,10 @@ class Swim::Change
       "#{obj_class}(#{obj_id}) #{verb} #{change_type}d (#{ change_type == :insert ? new_value.to_hash : old_value.to_hash })."
     end
   end
-    
+
   def new(args)
   end
-  
+
   def process
     if change_type == :update
       i = item
@@ -54,25 +54,25 @@ class Swim::Change
       return false
     end
   end
-  
+
   private
-  
-  # Convenience method for accessing the changed object in the database 
+
+  # Convenience method for accessing the changed object in the database
   def item
     obj_class.constantize.send(:find, obj_id)
   end
-  
-  # Method to execute the attribute update described by the Change  
+
+  # Method to execute the attribute update described by the Change
   def update(i)
     i.update_attribute(key, new_value)
   end
-  
-  # Method to execute the object deletion described by the Change    
+
+  # Method to execute the object deletion described by the Change
   def delete(i)
     i.destroy
   end
-  
-  # Method to execute the object insertion described by the Change  
+
+  # Method to execute the object insertion described by the Change
   def insert
     i = obj_class.constantize.send(:new, new_value)
     return i

data/lib/swim/sync_tools.rb

@@ -13,31 +13,31 @@ end
 
 # Tools for syncing a tree of ActiveRecord objects using a JSON file.
 class SyncTools
-  
-  # Save a JSON representaton of the object to a file, specified by  
+
+  # Save a JSON representaton of the object to a file, specified by
   def self.save_settings(obj)
-    str = obj.to_json(:include => obj.class.sync_settings )    
+    str = obj.to_json(:include => obj.class.sync_settings )
     File.open(File.expand_path(obj.settings_path), 'w+') {|f| f.write(str) }
   end
-  
-  # compares a tree of ActiveRecord objects to a previously-saved JSON file  
-  def self.compare_json_file(obj)    
+
+  # compares a tree of ActiveRecord objects to a previously-saved JSON file
+  def self.compare_json_file(obj)
     unless obj.methods.include?(:settings_path) || obj.methods.include?('settings_path')
       raise SettingsPathMissing, "#{obj.class.to_s} must define a class method named settings_file."
     end
     json = json_file(File.expand_path(obj.settings_path))
-    
+
     unless obj.class.methods.include?(:sync_settings) || obj.class.methods.include?("sync_settings")
       raise SyncSettingsMissing, "#{obj.class.to_s} must define a class method named sync_settings that returns a hash."
     end
-    
+
     if json[obj.class.to_s.underscore].class.to_s == "Hash"
       return compare(obj, json[obj.class.to_s.underscore], obj.class.sync_settings)
     else
       return compare(obj, json, obj.class.sync_settings)
     end
   end
-    
+
   def self.import_json_file(obj, settings_path)
     changes = Swim::SyncTools.compare_json_file(self, settings_path)
     completed = []
@@ -52,13 +52,13 @@ class SyncTools
     end
     return { :status => (not_completed.length > 0 ? "incomplete" : "complete"), :changed => completed, :not_completed => not_completed }
   end
-	
-  def self.compare(obj, hsh, settings) 
+
+  def self.compare(obj, hsh, settings)
     @changes = []
     if settings.present? && settings[:include]
       settings[:include].keys.each do |sk|
         compare_array(obj.send(sk), hsh[sk.to_s], settings[sk], sk)
-      end      
+      end
     elsif settings.present? && settings.keys
       settings.keys.each do |sk|
         compare_array(obj.send(sk), hsh[sk.to_s], settings[sk.to_sym], sk)
@@ -67,16 +67,18 @@ class SyncTools
 
     obj.attributes.each_pair do |key, value|
       hsh_value = hsh[key]
-      if value.class == Time && hsh_value.class == String
+
+      if value.is_a?(Time) && hsh_value.class == String
         hsh_value = Time.parse(hsh_value).utc.to_s
         value = value.utc.to_s
-      elsif hsh_value.class == Time && value.class == String
+      elsif hsh_value.is_a?(Time) && value.class == String
         hsh_value = hsh_value.utc.to_s
         value = Time.parse(value).utc.to_s
-      elsif hsh_value.class == Time && value.class == Time
+      elsif hsh_value.is_a?(Time) && value.is_a?(Time)
         hsh_value = hsh_value.utc.to_s
         value = value.utc.to_s
       end
+
       unless value == hsh_value
         # p "#{obj.class.to_s} #{obj.id} #{key} #{value} != #{hsh_value}"
         @changes << Swim::Change.new(:obj_class => obj.class.to_s, :obj_id => obj.id, :change_type => :update, :key => key, :old_value => value, :new_value => hsh_value)
@@ -86,7 +88,7 @@ class SyncTools
     end
     return @changes
   end
-  
+
   def self.compare_array(arr, hsh, settings, obj_classname)
     if arr.length == 0 && hsh.nil?
       return
@@ -109,8 +111,8 @@ class SyncTools
       end
     end
   end
-  
-  # loads and decodes a specified json_file  
+
+  # loads and decodes a specified json_file
   def self.json_file(settings_path)
     file = File.open(settings_path, "rb")
     contents = file.read

data/lib/swim/version.rb

@@ -1,3 +1,3 @@
 module Swim
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/lib/swim_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'swim'
 
 describe Swim do
-	it 'should return correct version string' do
-	    Swim.version_string.should == "Swim version #{Swim::VERSION}"
-	end
-end
+  it 'should return correct version string' do
+    Swim.version_string.should == "Swim version #{Swim::VERSION}"
+  end
+end

data/spec/lib/sync_tools_spec.rb

@@ -4,22 +4,22 @@ require 'swim/change'
 require 'swim/sync_tools'
 
 describe SyncTools do
-  
+
   context "necessary settings" do
     it "should require the object to define settings_path" do
       expect { SyncTools::compare_json_file(InvalidClass.new) }.to raise_error(
         SettingsPathMissing
       )
     end
-  
+
     it "should require the object to define sync_settings" do
       expect { SyncTools::compare_json_file(AlmostValidClass.new) }.to raise_error(
         SyncSettingsMissing
       )
     end
   end
-  
-  context "compare_json_file" do 
+
+  context "compare_json_file" do
     it "should return a change when one exists" do
       artist = Artist.find(1)
       changes = SyncTools::compare_json_file(artist)
@@ -27,7 +27,7 @@ describe SyncTools do
       changes.length.should == 1
       changes.first.should be_an_instance_of(Swim::Change)
     end
-    
+
     it "should correctly identify changes" do
       artist = Artist.find(2)
       SyncTools.save_settings(artist)
@@ -36,15 +36,15 @@ describe SyncTools do
       changes.should be_an_instance_of(Array)
       changes.length.should == 1
       changes.first.should be_an_instance_of(Swim::Change)
-    end    
+    end
   end
-  
+
   context "#save_settings" do
     it "should save settings in a json file" do
       artist = Artist.find(2)
       expect { SyncTools.save_settings(artist) }
     end
-    
+
     it "settings and object should be identical" do
       artist = Artist.find(2)
       SyncTools.save_settings(artist)
@@ -53,5 +53,5 @@ describe SyncTools do
       changes.length.should == 0
     end
   end
-  
+
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: swim
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  version: 0.0.3
 platform: ruby
 authors:
 - Jerry Richardson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-08 00:00:00.000000000 Z
+date: 2013-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   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
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -74,33 +69,26 @@ files:
 - swim.gemspec
 homepage: http://disruptive.github.com/swim
 licenses: []
+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'
-      segments:
-      - 0
-      hash: 3293738542906190303
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3293738542906190303
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Synchronize ActiveRecord Objects Across Environments with JSON and git
 test_files:
 - spec/db/development.sqlite3