ixtlan-core 0.7.4 → 0.7.5

data/features/step_definitions/simple_steps.rb

@@ -1 +1,160 @@
-require 'maven/cucumber_steps'
+require 'fileutils'
+require 'ruby-maven'
+module Maven
+  class CucumberSteps
+
+    def initialize(options = {})
+      @options = {:ruby_version => RUBY_VERSION }
+      @options[:jruby_version] = JRUBY_VERSION if defined? JRUBY_VERSION
+        
+      @options.merge!(options || {})
+    end
+
+    def rmvn
+      @rmvn ||= Maven::RubyMaven.new
+    end
+
+    def copy_tests(tests)
+      FileUtils.mkdir_p(@app_directory)
+      FileUtils.cp_r(File.join('templates', "tests-#{tests}", "."), 
+                     File.join(@app_directory, 'test'),
+                     :remove_destination => true)
+    end
+
+    def copy_specs(specs)
+      FileUtils.mkdir_p(@app_directory)
+      FileUtils.cp_r(File.join('templates', "specs-#{specs}", "."), 
+                     File.join(@app_directory, 'spec'),
+                     :remove_destination => true)
+    end
+
+    def copy_files(files)
+      FileUtils.mkdir_p(@app_directory)
+      FileUtils.cp_r(File.join('templates', "files-#{files}", "."), 
+                     @app_directory,
+                     :remove_destination => true)
+    end
+
+    def create_rails_application(template)
+      name = template.sub(/.template$/, '')
+      @app_directory = File.join('target', name)
+      
+      # rails version from gemspec
+      gemspec = File.read(Dir.glob("*.gemspec")[0])
+      rails_version = gemspec.split("\n").detect { |l| l =~ /development_dep.*rails/ }.sub(/'$/, '').sub(/.*'/, '')
+      
+      rmvn.options['-Dplugin.version'] = @options[:plugin_version] if @options[:plugin_version]
+      rmvn.options['-Djruby.version'] = @options[:jruby_version] if @options[:jruby_version]
+       if @options[:ruby_version]
+         rversion = @options[:ruby_version] =~ /^1.8./ ? '--1.8': '--1.9'
+         rmvn.options['-Djruby.switches'] = rversion
+       end
+      
+      rmvn.options['-Drails.version'] = rails_version
+      rmvn.options['-Dgem.home'] = ENV['GEM_HOME']
+      rmvn.options['-Dgem.path'] = ENV['GEM_PATH']
+      rmvn.options['-o'] = nil
+      
+      FileUtils.rm_rf(@app_directory)
+      
+      template_file = File.expand_path("templates/#{template}")
+      rmvn.exec("rails", "new", @app_directory, "-f", '--', '-e', "-Dtemplate=#{template_file}")
+    end
+
+    def given_template(template)
+      create_rails_application(template)
+    end
+
+    def given_template_and_tests(template, tests)
+      create_rails_application(template)
+      copy_tests(tests)
+    end
+
+    def given_template_and_specs(template, specs)
+      create_rails_application(template)
+      copy_specs(specs)
+    end
+
+    def given_template_and_files(template, files)
+      create_rails_application(template)
+      copy_files(files)
+    end
+
+    def given_application(name)
+      @app_directory = File.join('target', name)
+    end
+
+    def given_application_and_tests(name, tests)
+      @app_directory = File.join('target', name)
+      copy_tests(tests)
+    end
+
+    def given_application_and_specs(name, specs)
+      @app_directory = File.join('target', name)
+      copy_specs(specs)
+    end
+
+    def given_application_and_files(name, files)
+      @app_directory = File.join('target', name)
+      copy_files(files)
+    end
+
+    def execute(args)
+      rmvn.options['-l'] = "output.log"
+      rmvn.exec_in(@app_directory, args.split(' '))
+    end
+      
+    def expected_output(expected)
+      result = File.read(File.join(@app_directory, "output.log"))
+      expected.split(/\"?\s+and\s+\"?/).each do |exp|
+        puts exp
+        yield(result =~ /.*#{exp}.*/)
+      end 
+    end
+  end
+end
+
+
+steps = Maven::CucumberSteps.new(:plugin_version => '0.29.0')
+
+Given /^I create new rails application with template "(.*)"$/ do |template|
+  steps.given_template(template)
+end
+
+Given /^I create new rails application with template "(.*)" and "(.*)" tests$/ do |template, tests|
+  steps.given_template_and_tests(template, tests)
+end
+
+Given /^I create new rails application with template "(.*)" and "(.*)" specs$/ do |template, specs|
+  steps.given_template_and_specs(template, specs)
+end
+
+Given /^I create new rails application with template "(.*)" and "(.*)" files$/ do |template, files|
+  steps.given_template_and_files(template, files)
+end
+
+Given /^me an existing rails application "(.*)"$/ do |name|
+  steps.given_application(name)
+end
+
+Given /^me an existing rails application "(.*)" and "(.*)" tests$/ do |name, tests|
+  steps.given_application_and_tests(name, tests)
+end
+
+Given /^me an existing rails application "(.*)" and "(.*)" specs$/ do |name, specs|
+  steps.given_application_and_specs(name, specs)
+end
+
+Given /^me an existing rails application "(.*)" and "(.*)" files$/ do |name, files|
+  steps.given_application_and_files(name, files)
+end
+
+And /^I execute \"(.*)\"$/ do |args|
+  steps.execute(args)
+end
+
+Then /^the output should contain \"(.*)\"$/ do |expected|
+  steps.expected_output(expected) do |exp|
+    exp.should_not be_nil
+  end
+end

data/lib/ixtlan/core/active_record.rb

@@ -3,14 +3,17 @@ module Ixtlan
     module ActiveRecord
 
       def self.included(base)
+        warn 'deprecated: use ixtlan-optimistic instead'
         base.class_eval do
 
           def self.optimistic_find(updated_at, *args)
-            if updated_at
-              updated_at_date = new(:updated_at => updated_at).updated_at
+            if updated_at  
+              dummy = self.new
+              dummy.updated_at = updated_at
+              updated_at_date = dummy.updated_at
               # try different ways to use the date
               # TODO maybe there is a nicer way ??
-              first(:conditions => ["id = ? and updated_at <= ? and updated_at >= ?", args[0], updated_at + 0.0005, updated_at_date - 0.0005]) || first(:conditions => ["id = ? and updated_at <= ? and updated_at >= ?", args[0], updated_at_date + 0.0005, updated_at_date - 0.0005])
+              first(:conditions => ["id = ? and updated_at <= ? and updated_at >= ?", args[0], updated_at_date + 0.0005, updated_at_date - 0.0005])
               # TODO make it work with different PKs
             end
           end

data/lib/ixtlan/core/data_mapper.rb

@@ -2,16 +2,15 @@ module Ixtlan
   module Core
     module DataMapper
 
-      def self.included(base)
+      def self.included(base)        
+        warn 'deprecated: use ixtlan-optimistic instead'
         base.class_eval do
           
-          attr_accessor :current_user
-          
-          def optimistic_find(updated_at, *args)
+          def self.optimistic_get(updated_at, *args)
             if updated_at
-              updated_at = new(:updated_at => updated_at).updated_at
+              updated_at_date = new(:updated_at => updated_at).updated_at
               # TODO make it work with different PKs
-              first(:id => args[0], :updated_at => updated_at)
+              first(:id => args[0], :updated_at.gte => updated_at_date - 0.0005, :updated_at.lte => updated_at_date + 0.0005)
             end
           end
         end

data/lib/ixtlan/core/railtie.rb

@@ -34,7 +34,9 @@ module Ixtlan
     end
 
     class Railtie < Rails::Railtie
-      config.generators do |config|
+
+      gmethod = config.respond_to?(:generators)? :generators : :app_generators
+      config.send(gmethod) do |config|
         
         config.templates << File.expand_path('../../../generators/rails', __FILE__)
 
@@ -63,8 +65,7 @@ module Ixtlan
         
         if defined? ::DataMapper
 
-          ::DataMapper::Resource.send(:include, 
-                                      Ixtlan::Core::DataMapper)
+          ::DataMapper::Model.append_inclusions(Ixtlan::Core::DataMapper)
 
         elsif defined? ::ActiveRecord
 

metadata

@@ -2,7 +2,7 @@
 name: ixtlan-core
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors: 
   - mkristian
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-13 00:00:00 Z
+date: 2012-07-03 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: slf4r
@@ -75,7 +75,7 @@ dependencies:
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            version: 3.0.3.0.28.5
+            version: 3.0.4.0.29.0
     type: :development
     version_requirements: *id006
 description: cache header control, dynamic configuration, and optimistic find on model via updated_at timestamp
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.9
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: cache header control, dynamic configuration, and optimistic find on model via updated_at timestamp