mongoid_ext 0.6.1 → 0.6.2

data/Gemfile

@@ -5,6 +5,7 @@ gem 'uuidtools', '>= 2.1.1'
 gem 'i18n'
 gem 'tzinfo'
 gem 'differ', '>= 0.1.2'
+gem 'encryptor', '~> 1.1.3'
 
 group :development do
   gem "yard", "~> 0.6.0"

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.6.2

data/lib/mongoid_ext.rb

@@ -16,6 +16,7 @@ rescue LoadError
 end
 
 require 'mongoid_ext/patches'
+require 'mongoid_ext/encryptor'
 
 # types
 require 'mongoid_ext/types/open_struct'

data/lib/mongoid_ext/encryptor.rb

@@ -0,0 +1,33 @@
+module MongoidExt
+  module Encryptor
+    extend ActiveSupport::Concern
+
+    included do
+      require 'encryptor'
+    end
+
+    module ClassMethods
+      def encrypted_field(name, options = {})
+        key = options.delete(:key)
+        raise ArgumentError, ":key option must be given" if key.nil?
+
+        field(name, options)
+        alias_method :"#{name}_encrypted", name
+
+        define_method(name) do
+          value = [send(:"#{name}_encrypted").to_s].pack('H*')
+
+          return if value.blank?
+          Marshal.load(::Encryptor.decrypt(value, :key => key))
+        end
+
+        define_method("#{name}=") do |v|
+          marshaled = Marshal.dump(v)
+          enc_value = ::Encryptor.encrypt(marshaled, :key => key).unpack('H*')[0]
+
+          write_attribute(name, enc_value)
+        end
+      end
+    end
+  end
+end

data/lib/mongoid_ext/file.rb

@@ -41,7 +41,11 @@ module MongoidExt
     end
 
     def get
-      @io ||= gridfs.get(grid_filename)
+      @io ||= begin
+        gridfs.get(grid_filename)
+      rescue Mongo::GridFileNotFound
+        return nil
+      end
     end
 
     def reset

data/lib/mongoid_ext/versioning.rb

@@ -33,7 +33,9 @@ module Versioning
       end
 
       @rolling_back = true
-      save!
+      r = save!
+      @rolling_back = false
+      r
     end
 
     def load_version(pos = nil)
@@ -51,9 +53,30 @@ module Versioning
       version1 = self.version_at(pos1)
       version2 = self.version_at(pos2)
 
+      Differ.diff(version1.content(key), version2.content(key)).format_as(format).html_safe
+    end
+
+    def diff_by_word(key, pos1, pos2, format = :html)
+      version1 = self.version_at(pos1)
+      version2 = self.version_at(pos2)
+
       Differ.diff_by_word(version1.content(key), version2.content(key)).format_as(format).html_safe
     end
 
+    def diff_by_line(key, pos1, pos2, format = :html)
+      version1 = self.version_at(pos1)
+      version2 = self.version_at(pos2)
+
+      Differ.diff_by_line(version1.content(key), version2.content(key)).format_as(format).html_safe
+    end
+
+    def diff_by_char(key, pos1, pos2, format = :html)
+      version1 = self.version_at(pos1)
+      version2 = self.version_at(pos2)
+
+      Differ.diff_by_char(version1.content(key), version2.content(key)).format_as(format).html_safe
+    end
+
     def current_version
       version_klass.new(:data => self.attributes, self.class.versionable_options[:owner_field] => (self.updated_by_id_was || self.updated_by_id), :created_at => Time.now)
     end
@@ -107,7 +130,7 @@ module Versioning
         validates_presence_of :target_id
 
         def content(key)
-          cdata = self.data[key]
+          cdata = self.data[key.to_s]
           if cdata.respond_to?(:join)
             cdata.join(" ")
           else
@@ -162,10 +185,10 @@ module Versioning
         uuser_id = send(self.versionable_options[:owner_field]+"_was")||send(self.versionable_options[:owner_field])
         if !self.new? && !data.empty? && uuser_id
           max_versions = self.versionable_options[:max_versions].to_i
-          if self.version_ids.size >= max_versions
-            old = self.version_ids.slice!(0, max_versions)
+          if max_versions > 0 && self.version_ids.size >= max_versions
+            old = self.version_ids.slice!(0, max_versions-1)
             self.class.skip_callback(:save, :before, :save_version)
-            self.version_klass.delete_all(:_ids => old)
+            self.version_klass.where(:_id.in => old).delete_all
             self.save
             self.class.set_callback(:save, :before, :save_version)
           end

data/mongoid_ext.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid_ext}
-  s.version = "0.6.1"
+  s.version = "0.6.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David A. Cuadrado"]
-  s.date = %q{2011-06-25}
+  s.date = %q{2011-07-15}
   s.default_executable = %q{mongoid_console}
   s.description = %q{mongoid plugins}
   s.email = %q{krawek@gmail.com}
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
     "lib/mongoid_ext.rb",
     "lib/mongoid_ext/criteria_ext.rb",
     "lib/mongoid_ext/document_ext.rb",
+    "lib/mongoid_ext/encryptor.rb",
     "lib/mongoid_ext/file.rb",
     "lib/mongoid_ext/file_list.rb",
     "lib/mongoid_ext/file_server.rb",
@@ -58,6 +59,7 @@ Gem::Specification.new do |s|
     "test/helper.rb",
     "test/models.rb",
     "test/support/custom_matchers.rb",
+    "test/test_encryptor.rb",
     "test/test_filter.rb",
     "test/test_modifiers.rb",
     "test/test_paranoia.rb",
@@ -87,6 +89,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<i18n>, [">= 0"])
       s.add_runtime_dependency(%q<tzinfo>, [">= 0"])
       s.add_runtime_dependency(%q<differ>, [">= 0.1.2"])
+      s.add_runtime_dependency(%q<encryptor>, ["~> 1.1.3"])
       s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
@@ -101,6 +104,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<i18n>, [">= 0"])
       s.add_dependency(%q<tzinfo>, [">= 0"])
       s.add_dependency(%q<differ>, [">= 0.1.2"])
+      s.add_dependency(%q<encryptor>, ["~> 1.1.3"])
       s.add_dependency(%q<yard>, ["~> 0.6.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
@@ -116,6 +120,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<i18n>, [">= 0"])
     s.add_dependency(%q<tzinfo>, [">= 0"])
     s.add_dependency(%q<differ>, [">= 0.1.2"])
+    s.add_dependency(%q<encryptor>, ["~> 1.1.3"])
     s.add_dependency(%q<yard>, ["~> 0.6.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])

data/test/models.rb

@@ -1,3 +1,12 @@
+class CreditCard # for encryptor
+  include Mongoid::Document
+  include MongoidExt::Encryptor
+
+  encrypted_field :number, :type => Integer, :key => "my password"
+  encrypted_field :data, :type => Hash, :key => "my password"
+  encrypted_field :extra, :key => "my password"
+end
+
 
 class Event # for safe_update, and Timestamp
   include Mongoid::Document

data/test/test_encryptor.rb

@@ -0,0 +1,31 @@
+require 'helper'
+
+class StorageTest < Test::Unit::TestCase
+  context "Encrypting fields" do
+    setup do
+      @cc = CreditCard.create(:number => 12345, :data => {:month => 10, :year => 2014})
+    end
+
+    should "be able to load the number" do
+      @cc.reload
+      @cc.number.should == 12345
+    end
+
+    should "be able to load a hash or array" do
+      @cc.reload
+      @cc.data.should == {:month => 10, :year => 2014}
+    end
+
+    should "encrypt the field" do
+      @cc.reload
+      @cc.data_encrypted.should == 'd3f1d84f75f95027af7697f59c07437508ec98377a6d4104c7d7dc79967bf46b'
+    end
+
+    should "not fail with nil values" do
+      @cc.data = nil
+      @cc.save
+      @cc.reload
+      @cc.data.should == nil
+    end
+  end
+end

data/test/test_versioning.rb

@@ -24,9 +24,8 @@ class TestVersioning < Test::Unit::TestCase
       @blogpost.title = "sistemas operativos"
       @blogpost.save!
       @blogpost.reload
-
-      @blogpost.diff(:title, "current", 0, :ascii).should == '{+"sistemas operativos"}'
-      @blogpost.diff(:title, 0, "current", :ascii).should == '{-"sistemas operativos"}'
+      @blogpost.diff_by_word(:title, "current", 0, :ascii).should == "{\"operating\" >> \"sistemas\"} {\"systems\" >> \"operativos\"}"
+      @blogpost.diff_by_line(:title, 0, "current", :ascii).should == "{\"sistemas operativos\" >> \"operating systems\"}"
     end
 
     should "be able to restore a previous version" do
@@ -49,6 +48,7 @@ class TestVersioning < Test::Unit::TestCase
       @blogpost.title = "sistemas operativos 3"
       @blogpost.save!
       @blogpost.reload
+
       @blogpost.versions.count.should == 2
     end
   end

data/test/types/test_open_struct.rb

@@ -16,7 +16,7 @@ class OpenStructTest < Test::Unit::TestCase
       @config.entries = entries
       @config.save
 
-      from_db.entries["new_key"].should == "my new key"
+      from_db.entries.new_key.should == "my new key"
     end
   end
 end

data/test/types/test_set.rb

@@ -7,7 +7,9 @@ class SetTest < Test::Unit::TestCase
 
   context "working with sets" do
     setup do
-      @recipe = Recipe.create!(:ingredients => %w[salt sugar water salt sugar water])
+      @recipe = Recipe.new
+      @recipe.ingredients = Set.new(%w[salt sugar water salt sugar water])
+      @recipe.save
     end
 
     should "not have duplicates" do
@@ -20,6 +22,9 @@ class SetTest < Test::Unit::TestCase
     should "not add duplicates" do
       original_size = @recipe.ingredients.size
       @recipe.ingredients << "salt"
+      @recipe.save
+      @recipe.reload
+
       @recipe.ingredients.size.should == original_size
     end
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 1
-  version: 0.6.1
+  - 2
+  version: 0.6.2
 platform: ruby
 authors: 
 - David A. Cuadrado
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-25 00:00:00 -05:00
+date: 2011-07-15 00:00:00 -05:00
 default_executable: mongoid_console
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -87,8 +87,23 @@ dependencies:
   prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: encryptor
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 3
+        version: 1.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: yard
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -100,10 +115,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -115,10 +130,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -130,10 +145,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: shoulda
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -145,10 +160,10 @@ dependencies:
         version: 2.11.3
   type: :development
   prerelease: false
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: jnunemaker-matchy
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -159,10 +174,10 @@ dependencies:
         version: "0.4"
   type: :development
   prerelease: false
-  version_requirements: *id010
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: shoulda
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -174,10 +189,10 @@ dependencies:
         version: 2.11.3
   type: :development
   prerelease: false
-  version_requirements: *id011
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: mocha
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -189,10 +204,10 @@ dependencies:
         version: 0.9.4
   type: :development
   prerelease: false
-  version_requirements: *id012
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: timecop
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -202,7 +217,7 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id013
+  version_requirements: *id014
 description: mongoid plugins
 email: krawek@gmail.com
 executables: 
@@ -224,6 +239,7 @@ files:
 - lib/mongoid_ext.rb
 - lib/mongoid_ext/criteria_ext.rb
 - lib/mongoid_ext/document_ext.rb
+- lib/mongoid_ext/encryptor.rb
 - lib/mongoid_ext/file.rb
 - lib/mongoid_ext/file_list.rb
 - lib/mongoid_ext/file_server.rb
@@ -252,6 +268,7 @@ files:
 - test/helper.rb
 - test/models.rb
 - test/support/custom_matchers.rb
+- test/test_encryptor.rb
 - test/test_filter.rb
 - test/test_modifiers.rb
 - test/test_paranoia.rb