lev 2.0.4 → 2.0.5

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - "1.9.3-p392"
+install:
+  - bundle install
+script:
+  - bundle exec rake
+notifications:
+  email: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lev (2.0.4)
+    lev (2.0.5)
       actionpack (>= 3.0)
       active_attr
       activemodel (>= 3.0)
@@ -13,8 +13,8 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (4.0.0)
-      activesupport (= 4.0.0)
+    actionpack (4.0.3)
+      activesupport (= 4.0.3)
       builder (~> 3.1.0)
       erubis (~> 2.7.0)
       rack (~> 1.5.2)
@@ -22,23 +22,23 @@ GEM
     active_attr (0.8.2)
       activemodel (>= 3.0.2, < 4.1)
       activesupport (>= 3.0.2, < 4.1)
-    activemodel (4.0.0)
-      activesupport (= 4.0.0)
+    activemodel (4.0.3)
+      activesupport (= 4.0.3)
       builder (~> 3.1.0)
-    activerecord (4.0.0)
-      activemodel (= 4.0.0)
+    activerecord (4.0.3)
+      activemodel (= 4.0.3)
       activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.0)
+      activesupport (= 4.0.3)
       arel (~> 4.0.0)
     activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.0)
+    activesupport (4.0.3)
       i18n (~> 0.6, >= 0.6.4)
       minitest (~> 4.2)
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
-    arel (4.0.0)
-    atomic (1.1.14)
+    arel (4.0.2)
+    atomic (1.1.15)
     builder (3.1.4)
     columnize (0.3.6)
     debugger (1.6.2)
@@ -50,9 +50,9 @@ GEM
     diff-lcs (1.2.4)
     erubis (2.7.0)
     hashie (2.0.5)
-    i18n (0.6.5)
+    i18n (0.6.9)
     minitest (4.7.5)
-    multi_json (1.8.0)
+    multi_json (1.8.4)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -65,14 +65,15 @@ GEM
     rspec-expectations (2.14.3)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.3)
-    thread_safe (0.1.3)
-      atomic
+    sqlite3 (1.3.9)
+    thread_safe (0.2.0)
+      atomic (>= 1.1.7, < 2)
     transaction_isolation (1.0.3)
       activerecord (>= 3.0.11)
     transaction_retry (1.0.2)
       activerecord (>= 3.0.11)
       transaction_isolation (>= 1.0.2)
-    tzinfo (0.3.37)
+    tzinfo (0.3.38)
 
 PLATFORMS
   ruby
@@ -83,3 +84,4 @@ DEPENDENCIES
   lev!
   rake
   rspec
+  sqlite3

data/Rakefile

@@ -1 +1,7 @@
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new
+
+task default: :spec
+task test: :spec

data/lev.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "debugger"
 
 end

data/lib/lev/error_translator.rb

@@ -11,10 +11,11 @@ module Lev
         message = error.message || Lev::BetterActiveModelErrors.generate_message(model, attribute, error.code)
         Lev::BetterActiveModelErrors.full_message(model, attribute, message)
       else
-        error.code.to_s
+        message = error.message.to_s
+        message.empty? ? error.code.to_s : message
       end      
     end
 
   end
 
-end
+end

data/lib/lev/version.rb

@@ -1,3 +1,3 @@
 module Lev
-  VERSION = "2.0.4"
+  VERSION = "2.0.5"
 end

data/spec/create_sprocket_spec.rb

@@ -3,7 +3,12 @@ require 'spec_helper'
 describe CreateSprocket do
   
   it "should transfer errors appropriately" do
-    results, errors = CreateSprocket.call(1,"42")
+    result = CreateSprocket.call(1,"42")
+    errors = result.errors.collect { |error| error.translate }
+    expect(errors).to eq([
+      'Integer gt 2 must be greater than or equal to 3',
+      'Text only letters can only contain letters',
+    ])
   end
 
-end
+end

data/spec/routine_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe Routine do
+describe Lev::Routine do
 
   
 
-end
+end

data/spec/spec_helper.rb

@@ -19,4 +19,20 @@ end
 
 require 'lev'
 
-Dir[(File.expand_path('../support', __FILE__)) + ("/**/*.rb")].each { |f| require f }
+Dir[(File.expand_path('../support', __FILE__)) + ("/**/*.rb")].each { |f| require f }
+
+ActiveRecord::Base.establish_connection(
+  adapter: :sqlite3,
+  database: ':memory:',
+)
+ActiveRecord::ConnectionAdapters::SQLiteAdapter = ActiveRecord::ConnectionAdapters::SQLite3Adapter
+TransactionIsolation.apply_activerecord_patch
+
+unless Sprocket.table_exists?
+  ActiveRecord::Schema.define do
+    create_table 'sprockets', force: true do |t|
+      t.integer 'integer_gt_2'
+      t.string 'text_only_letters'
+    end
+  end
+end

data/spec/sprocket_handler_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe SprocketHandler do
+  it 'should return fatal error messages' do
+    SprocketHandler.any_instance.stub(:params).and_return({
+      sprocket: {
+        integer_gt_2: '1',
+        text_only_letters: '42',
+      }
+    })
+    result = SprocketHandler.handle
+    errors = result.errors.collect { |error| error.translate }
+    expect(errors).to eq(['Code cannot be blank'])
+  end
+
+  it 'should return fatal error codes if messages are missing' do
+    SprocketHandler.any_instance.stub(:params).and_return({
+      sprocket: {
+        integer_gt_2: '1',
+        text_only_letters: '42',
+      },
+      code: '1111',
+    })
+    result = SprocketHandler.handle
+    errors = result.errors.collect { |error| error.translate }
+    expect(errors).to eq(['invalid_code'])
+  end
+end

data/spec/support/create_sprocket.rb

@@ -1,6 +1,6 @@
 class CreateSprocket
 
-  lev_routine
+  include Lev::Routine
 
 protected
 
@@ -8,7 +8,7 @@ protected
     sprocket = Sprocket.new(integer_gt_2: number, text_only_letters: text)
     sprocket.valid?
 
-    transfer_errors_from(sprocket)
+    transfer_errors_from(sprocket, {scope: :sprocket})
   end
 
-end
+end

data/spec/support/sprocket.rb

@@ -1,10 +1,7 @@
-class Sprocket
-  include ActiveAttr::Model
+class Sprocket < ActiveRecord::Base
 
-  attribute :integer_gt_2, type: Integer
   validates :integer_gt_2, numericality: { only_integer: true,
                                            greater_than_or_equal_to: 3 }
-  attribute :text_only_letters, type: String
   validates :text_only_letters, allow_blank: true,
                                 format: { with: /\A[a-zA-Z]+\z/, message: "can only contain letters" }
-end
+end

data/spec/support/sprocket_handler.rb

@@ -0,0 +1,20 @@
+class SprocketHandler
+
+  include Lev::Handler
+
+  uses_routine CreateSprocket
+
+protected
+
+  def authorized?
+    true
+  end
+
+  def handle
+    fatal_error(code: :no_code, message: 'Code cannot be blank') if params[:code].nil?
+    fatal_error(code: :invalid_code) if params[:code] != 'code'
+    run(CreateSprocket, params[:sprocket][:integer_gt_2],
+        params[:sprocket][:text_only_letters])
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lev
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-12 00:00:00.000000000 Z
+date: 2014-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -171,6 +171,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: debugger
   requirement: !ruby/object:Gem::Requirement
@@ -198,6 +214,7 @@ files:
 - .rspec
 - .ruby-gemset
 - .ruby-version
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -228,9 +245,11 @@ files:
 - spec/outputs_spec.rb
 - spec/routine_spec.rb
 - spec/spec_helper.rb
+- spec/sprocket_handler_spec.rb
 - spec/sprocket_spec.rb
 - spec/support/create_sprocket.rb
 - spec/support/sprocket.rb
+- spec/support/sprocket_handler.rb
 homepage: http://github.com/lml/lev
 licenses:
 - MIT
@@ -246,7 +265,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1726460375409349289
+      hash: -2969297821958856203
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -255,7 +274,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1726460375409349289
+      hash: -2969297821958856203
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -268,6 +287,8 @@ test_files:
 - spec/outputs_spec.rb
 - spec/routine_spec.rb
 - spec/spec_helper.rb
+- spec/sprocket_handler_spec.rb
 - spec/sprocket_spec.rb
 - spec/support/create_sprocket.rb
 - spec/support/sprocket.rb
+- spec/support/sprocket_handler.rb