ohm-contrib 0.1.1 → 0.1.2

data/lib/ohm/contrib.rb

@@ -1,6 +1,6 @@
 module Ohm
   module Contrib
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 
   autoload :ActiveModelExtension, "ohm/contrib/active_model_extension"
@@ -18,4 +18,4 @@ module Ohm
   autoload :Scope,                "ohm/contrib/scope"
   autoload :SoftDelete,           "ohm/contrib/soft_delete"
   autoload :FulltextSearching,    "ohm/contrib/fulltext_searching"
-end
+end

data/lib/ohm/contrib/callbacks.rb

@@ -55,7 +55,6 @@ module Ohm
   module Callbacks
     def self.included(base)
       base.extend Macros
-      base.extend Overrides
     end
 
     module Macros
@@ -127,18 +126,6 @@ module Ohm
       end
     end
 
-    # This module is for class method overrides. As of now
-    # it only overrides Ohm::Model::create to force calling save
-    # instead of calling create so that Model.create will call
-    # not only before/after :create but also before/after :save
-    module Overrides
-      def create(*args)
-        model = new(*args)
-        model.save
-        model
-      end
-    end
-
     # Overrides the validate method of Ohm::Model. This is a bit tricky,
     # since typically you override this. Make sure you do something like:
     #
@@ -165,10 +152,20 @@ module Ohm
     # If the create succeeds, all after :create callbacks are
     # executed.
     def create
-      execute_callback(:before, :create)  if valid?
+      return unless valid?
+
+      execute_callback(:before, :create)
+      execute_callback(:before, :save)
+
+      initialize_id
 
-      super.tap do |is_created|
-        execute_callback(:after, :create)  if is_created
+      mutex do
+        create_model_membership
+        write
+        add_to_indices
+
+        execute_callback(:after, :create)
+        execute_callback(:after, :save)
       end
     end
 
@@ -178,18 +175,18 @@ module Ohm
     # If the save also succeeds, all after :save callbacks are
     # executed.
     def save
-      existing = !new?
+      return create if new?
+      return unless valid?
 
-      if valid?
-        execute_callback(:before, :save)
-        execute_callback(:before, :update) if existing
-      end
+      execute_callback(:before, :save)
+      execute_callback(:before, :update)
 
-      super.tap do |is_saved|
-        if is_saved
-          execute_callback(:after, :save)
-          execute_callback(:after, :update) if existing
-        end
+      mutex do
+        write
+        update_indices
+
+        execute_callback(:after, :save)
+        execute_callback(:after, :update)
       end
     end
 
@@ -222,5 +219,4 @@ module Ohm
       __send__("#{ position }_#{ method }")
     end
   end
-end
-
+end

data/lib/ohm/contrib/typecast.rb

@@ -2,18 +2,7 @@ require 'bigdecimal'
 require 'time'
 require 'date'
 require 'forwardable'
-
-begin
-  require "yajl/json_gem"
-rescue LoadError
-  $stderr.puts(
-    "WARNING: Currently using the `json` gem. You might encounter encoding " +
-    "problems with `Ohm::Types::Hash` and `Ohm::Types::Array`. Best to use " +
-    "the `yajl-ruby` gem to avoid problems and also for performance reasons."
-  )
-
-  require "json"
-end
+require "json"
 
 module Ohm
   # Provides all the primitive types. The following are included:

data/test/typecast_hash_test.rb

@@ -113,7 +113,7 @@ test "ascii 8bit encoding" do
 
   data = File.read(txt, :encoding => "ascii-8bit")
 
-  post = Post.create(:address => { "address1" => data })
+  post = Post.create(:address => { "address1" => data.force_encoding("UTF-8") })
   post = Post[post.id]
 
   assert_equal post.address["address1"], data.force_encoding("UTF-8")

metadata

@@ -1,82 +1,78 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ohm-contrib
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.1.2
   prerelease: 
-  version: 0.1.1
 platform: ruby
-authors: 
+authors:
 - Cyril David
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-09 00:00:00 +08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-21 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: ohm
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2164476460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: cutest
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2164476460
+- !ruby/object:Gem::Dependency
+  name: cutest
+  requirement: &2164475860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: redis
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2164475860
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: &2164474640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: lunar
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2164474640
+- !ruby/object:Gem::Dependency
+  name: lunar
+  requirement: &2164474060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: override
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2164474060
+- !ruby/object:Gem::Dependency
+  name: override
+  requirement: &2164473440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-description: Includes a couple of core functions such as callbacks, timestamping, typecasting and lots of generic validation routines.
+  prerelease: false
+  version_requirements: *2164473440
+description: Includes a couple of core functions such as callbacks, timestamping,
+  typecasting and lots of generic validation routines.
 email: cyx.ucron@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/ohm/contrib/active_model_extension.rb
 - lib/ohm/contrib/boundaries.rb
 - lib/ohm/contrib/callbacks.rb
@@ -97,7 +93,6 @@ files:
 - LICENSE
 - Rakefile
 - test/activemodel_test.rb
-- test/autoload_test.rb
 - test/boundaries_test.rb
 - test/callbacks_lint.rb
 - test/date_validations_test.rb
@@ -125,33 +120,28 @@ files:
 - test/typecast_time_test.rb
 - test/typecast_timezone_test.rb
 - test/web_validations_test.rb
-has_rdoc: true
 homepage: http://github.com/cyx/ohm-contrib
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: ohm-contrib
-rubygems_version: 1.5.0
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 2
 summary: A collection of decoupled drop-in modules for Ohm.
 test_files: []
-

data/test/autoload_test.rb

@@ -1,19 +0,0 @@
-# encoding: UTF-8
-
-require File.expand_path("./helper", File.dirname(__FILE__))
-
-test "autoloading of all libraries" do
-  assert_nothing_raised NameError, LoadError do
-    Ohm::ActiveModelExtension
-    Ohm::Boundaries
-    Ohm::Timestamping
-    Ohm::WebValidations
-    Ohm::NumberValidations
-    Ohm::Typecast
-    Ohm::Locking
-    Ohm::ExtraValidations
-    Ohm::DateValidations
-    Ohm::FulltextSearching
-    Ohm::Slug
-  end
-end