mappable 0.0.2 → 0.0.3

data/app/models/mappable/map.rb

@@ -6,13 +6,25 @@ module Mappable
       Mappable::MapRouter.build_map_routes!
     end
 
+    def cached_mappings
+      @cache ||= begin
+        self.mappings.inject({}) do |cache, m|
+          cache[:to] ||= {}
+          cache[:to][m.to.downcase] = m.from
+
+          cache[:from] ||= {}
+          cache[:from][m.from.downcase] = m.to
+          
+          cache
+        end
+      end
+    end
+
     def value_for(mapping_name, in_value)
-      in_direction = :from if to.to_sym == mapping_name
-      in_direction = :to if from.to_sym == mapping_name
-      if in_direction
-        out_direction = :from if in_direction == :to
-        out_direction = :to if in_direction == :from
-        self.mappings.where(in_direction => in_value).first.send(out_direction)
+      direction = :from if to.to_sym == mapping_name
+      direction = :to if from.to_sym == mapping_name
+      if direction
+        cached_mappings[direction][in_value.downcase]
       end
     end
   end

data/app/models/mappable/mapping.rb

@@ -2,5 +2,8 @@ module Mappable
   class Mapping < ActiveRecord::Base
     belongs_to :map
     belongs_to :parent_map, :foreign_key => :map_id, :class_name => :Map
+    
+    validates_uniqueness_of :from, :scope => :map_id, :message => "must be unique [%{value}]"
+    validates_presence_of :map
   end
 end

data/lib/mappable/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mappable
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-22 00:00:00.000000000Z
+date: 2011-09-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2156576460 !ruby/object:Gem::Requirement
+  requirement: &2152468200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156576460
+  version_requirements: *2152468200
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2156575540 !ruby/object:Gem::Requirement
+  requirement: &2152465340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.3.4
   type: :development
   prerelease: false
-  version_requirements: *2156575540
+  version_requirements: *2152465340
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2156574500 !ruby/object:Gem::Requirement
+  requirement: &2152464080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *2156574500
+  version_requirements: *2152464080
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &2156573540 !ruby/object:Gem::Requirement
+  requirement: &2152462460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.1
   type: :development
   prerelease: false
-  version_requirements: *2156573540
+  version_requirements: *2152462460
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2156572800 !ruby/object:Gem::Requirement
+  requirement: &2152461560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.10.0
   type: :development
   prerelease: false
-  version_requirements: *2156572800
+  version_requirements: *2152461560
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &2156571620 !ruby/object:Gem::Requirement
+  requirement: &2152456100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: 2.0.5
   type: :development
   prerelease: false
-  version_requirements: *2156571620
+  version_requirements: *2152456100
 description: Lightweight string mappings engine for Rails
 email:
 - mikebannister@gmail.com
@@ -137,7 +137,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4377014865643653160
+      hash: 3012157512411578491
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -146,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4377014865643653160
+      hash: 3012157512411578491
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.8