spik 0.0.2 → 0.0.3

data/README.rdoc

@@ -260,13 +260,13 @@ After that you can work with variables @post and @posts:
 Puts this line into `Gemfile` then run `$ bundle`:
 
 ``` ruby
-gem 'spik', '0.0.2'
+gem 'spik', '0.0.3'
 ```
 
 Or if you are old-school Rails 2 developer put this into `config/environment.rb` and run `$ rake gems:install`:
 
 ``` ruby
-config.gem 'spik', :version => '0.0.2'
+config.gem 'spik', :version => '0.0.3'
 ```
 
 Or manually install spik gem: `$ gem install spik`

data/lib/spik.rb

@@ -1,50 +1,17 @@
 require 'spik/models'
 require 'spik/execution'
+require 'spik/validators'
 
 module Spik
   include Models
   include Execution
-
-  WHICH_NAMES = %w(all first)
-  METHOD_NAMES = %w(find delete)
+  include Validators
 
   def method_missing(method, *args)
     args.flatten! if args.is_a? Array
     method = method.to_s
-    if model_names.include?(method)
-      [method, args]
-    elsif model_names.include?(method[0..-2])
-      [method[0..-2], args]
-    elsif WHICH_NAMES.include?(method)
-      if args[0] !~ /@/
-        [method, args].flatten
-      else
-        args[0]
-      end
-    elsif METHOD_NAMES.include?(method)
-      if args[0] !~ /@/
-        execute_method(method, args)
-      else
-        instance_variable_get(args[0])
-      end
-    elsif !attributes.select{ |k,v| v.include? method }.empty?
-      if args[0] == 'like'
-        method + ' LIKE "%' + args[1] + '%"'
-      elsif args[0].is_a? String
-        method + ' = \'' + args[0] + '\''
-      else
-        method + ' = ' + args[0].to_s
-      end
-    elsif !class_methods.select{ |k,v| v.include? method.to_sym }.empty?
-      execute_class_method(method, args[0], args[1])
-    elsif method == 'like'
-      [method, args]
-    elsif %w(with which has have who from).include? method
-      args.flatten
-    elsif method == 'as'
-      ['as__' + args[0], args[1..-1]]
-    else
-      [method, args]
-    end
+
+    # TODO: catch methods, which cannot be variable name
+    spik_method(method, args) # or raise NoMethodError.new('There is no method "' + method + '"')
   end
 end

data/lib/spik/validators.rb

@@ -0,0 +1,63 @@
+module Spik
+  module Validators
+    WHICH_NAMES = %w(all first)
+    METHOD_NAMES = %w(find delete)
+
+    def spik_method(method, args)
+      if model_names.include?(method)
+        return_value_of(:model, method, args)
+      elsif model_names.include?(method[0..-2])
+        return_value_of(:model, method[0..-2], args)
+      elsif WHICH_NAMES.include?(method)
+        return_value_of(:which, method, args)
+      elsif METHOD_NAMES.include?(method)
+        return_value_of(:method, method, args)
+      elsif !attributes.select{ |k,v| v.include? method }.empty?
+        return_value_of(:attribute, method, args)
+      elsif !class_methods.select{ |k,v| v.include? method.to_sym }.empty?
+        return_value_of(:class_method, method, args)
+      elsif method == 'like'
+        return_value_of(:like, method, args)
+      elsif %w(with which has have who from).include? method
+        return_value_of(:keyword, method, args)
+      elsif method == 'as'
+        return_value_of(:alias, method, args)
+      else
+        return_value_of(:variable, method, args)
+      end
+    end
+
+    def return_value_of(type, method, args)
+      case type
+        when :model, :like, :variable
+          [method, args]
+        when :which
+          if args[0] !~ /@/
+            [method, args].flatten
+          else
+            args[0]
+          end
+        when :sql_method
+          if args[0] !~ /@/
+            execute_method(method, args)
+          else
+            instance_variable_get(args[0])
+          end
+        when :attribute
+          if args[0] == 'like'
+            method + ' LIKE "%' + args[1] + '%"'
+          elsif args[0].is_a? String
+            method + ' = \'' + args[0] + '\''
+          else
+            method + ' = ' + args[0].to_s
+          end
+        when :class_method
+          execute_class_method(method, args[0], args[1])
+        when :keyword
+          args.flatten
+        when :alias
+          ['as__' + args[0], args[1..-1]]
+      end
+    end
+  end
+end

data/lib/spik/version.rb

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

data/test/dummy/log/development.log

@@ -1363,3 +1363,16 @@ NameError (uninitialized constant Posts):
 Rendered /Users/gazay/.rvm/gems/ruby-1.9.3-head/gems/actionpack-3.1.1/lib/action_dispatch/middleware/templates/rescues/_trace.erb (1.5ms)
 Rendered /Users/gazay/.rvm/gems/ruby-1.9.3-head/gems/actionpack-3.1.1/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb (1.0ms)
 Rendered /Users/gazay/.rvm/gems/ruby-1.9.3-head/gems/actionpack-3.1.1/lib/action_dispatch/middleware/templates/rescues/diagnostics.erb within rescues/layout (4.9ms)
+   (0.4ms)  select sqlite_version(*)
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+   (0.0ms)  PRAGMA index_list("notices")
+   (0.0ms)  PRAGMA index_list("posts")
+   (0.2ms)  select sqlite_version(*)
+   (1.0ms)  CREATE TABLE "notices" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "body" text, "created_at" datetime, "updated_at" datetime) 
+   (7.9ms)  CREATE TABLE "posts" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "body" text, "created_at" datetime, "updated_at" datetime) 
+   (1.2ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.0ms)  PRAGMA index_list("schema_migrations")
+   (1.2ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (1.1ms)  INSERT INTO "schema_migrations" (version) VALUES ('20111022090628')
+   (1.1ms)  INSERT INTO "schema_migrations" (version) VALUES ('20111022073857')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spik
 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-10-26 00:00:00.000000000 Z
+date: 2011-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2153723280 !ruby/object:Gem::Requirement
+  requirement: &2153494400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.1
   type: :development
   prerelease: false
-  version_requirements: *2153723280
+  version_requirements: *2153494400
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2153722860 !ruby/object:Gem::Requirement
+  requirement: &2153493980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153722860
+  version_requirements: *2153493980
 description: You can say something and controller understands you
 email:
 - alex.gaziev@gmail.com
@@ -42,7 +42,7 @@ extra_rdoc_files: []
 files:
 - lib/spik/execution.rb
 - lib/spik/models.rb
-- lib/spik/tmp.rb
+- lib/spik/validators.rb
 - lib/spik/version.rb
 - lib/spik.rb
 - lib/tasks/spik_tasks.rake
@@ -80,6 +80,7 @@ files:
 - test/dummy/db/migrate/20111022090628_create_notices.rb
 - test/dummy/db/production.sqlite3
 - test/dummy/db/schema.rb
+- test/dummy/db/test.sqlite3
 - test/dummy/log/development.log
 - test/dummy/log/production.log
 - test/dummy/log/test.log
@@ -97,10 +98,7 @@ files:
 - test/dummy/tmp/cache/assets/DD0/030/sprockets%2F6fea4f8c8ac6003482feb9df8afa0361
 - test/dummy/tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
 - test/dummy/tmp/cache/assets/E54/940/sprockets%2Fe5c4f565eaabc3ea3cc4006bf5b9c6ce
-- test/integration/missing_method_test.rb
-- test/spik_test.rb
-- test/test_helper.rb
-homepage: 
+homepage: https://github.com/gazay/spik
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -156,6 +154,7 @@ test_files:
 - test/dummy/db/migrate/20111022090628_create_notices.rb
 - test/dummy/db/production.sqlite3
 - test/dummy/db/schema.rb
+- test/dummy/db/test.sqlite3
 - test/dummy/log/development.log
 - test/dummy/log/production.log
 - test/dummy/log/test.log
@@ -173,6 +172,3 @@ test_files:
 - test/dummy/tmp/cache/assets/DD0/030/sprockets%2F6fea4f8c8ac6003482feb9df8afa0361
 - test/dummy/tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
 - test/dummy/tmp/cache/assets/E54/940/sprockets%2Fe5c4f565eaabc3ea3cc4006bf5b9c6ce
-- test/integration/missing_method_test.rb
-- test/spik_test.rb
-- test/test_helper.rb

data/lib/spik/tmp.rb

@@ -1,50 +0,0 @@
-
-# def can(*args)
-#   p args.first
-# end
-# 
-# def you(*args)
-#   args.first
-# end
-# 
-# def say(*args)
-#   args.first
-# end
-
-def method_missing(m, *a)
-  m.to_s
-end
-
-# can you say please?
-
-def make(*args)
-  p args.first
-end
-
-def me(*args)
-  case args.first
-  when 'happy!'
-    'smile, bitch ^_^'
-  else
-    "r u sad bastard? c'mon!!!"
-  end
-end
-
-def girl(*args)
-  case args.first
-  when /happy/
-    ':P'
-  else
-    'SLAP!'
-  end
-end
-
-make me happy!
-
-make girl happy
-
-chain = Proc.new do |*methods|
-  p methods.to_s + '123'
-end
-
-p chain.call(make.to_proc)

data/test/integration/missing_method_test.rb

@@ -1,12 +0,0 @@
-# require 'test_helper'
-# 
-# class MissingMethodTest < ActiveSupport::IntegrationCase
-#   test 'pdf request sends a pdf as file' do
-#     visit home_path
-#   end
-# 
-#   protected
-#   def headers
-#     page.response_headers
-#   end
-# end

data/test/spik_test.rb

@@ -1,13 +0,0 @@
-require 'test_helper'
-
-class SpikTest < ActiveSupport::TestCase
-  test "truth" do
-    assert_kind_of Module, Spik
-  end
-
-  test "should return first post" do
-    include Spik
-    find first post
-    assert_not_nil @post
-  end
-end

data/test/test_helper.rb

@@ -1,10 +0,0 @@
-# Configure Rails Environment
-ENV["RAILS_ENV"] = "test"
-
-require File.expand_path("../dummy/config/environment.rb",  __FILE__)
-require "rails/test_help"
-
-Rails.backtrace_cleaner.remove_silencers!
-
-# Load support files
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }