netzke-basepack 0.7.4 → 0.7.5

data/lib/netzke/sequel/combobox_options.rb

@@ -0,0 +1,10 @@
+module Netzke
+  module Sequel
+    module ComboboxOptions
+      def netzke_combo_options_for(column, query = "")
+        ds = query.empty? ? self : filter(column.to_sym.ilike("#{query}%"))
+        ds.select(column.to_sym).distinct.all.map &column.to_sym
+      end
+    end
+  end
+end

data/lib/netzke/sequel/relation_extensions.rb

@@ -0,0 +1,40 @@
+module Netzke
+  module Sequel
+    module RelationExtensions
+      def self.included receiver
+        receiver.class_eval do
+          def_dataset_method :extend_with do |*params|
+            scope = params.shift
+            case scope.class.name
+            when "Symbol" # model's scope
+              self.send(scope, *params)
+            when "String" # SQL query or SQL query with params (e.g. ["created_at < ?", 1.day.ago])
+              params.empty? ? self.where(scope) : self.where([scope, *params])
+            when "Array"
+              self.extend_with(*scope)
+            when "Hash"  # conditions hash
+              self.where(scope)
+            when "ActiveSupport::HashWithIndifferentAccess" # conditions hash
+              self.where(scope)
+            when "Proc"   # receives a relation, must return a relation
+              scope.call(self)
+            else
+              raise ArgumentError, "Wrong parameter type for ActiveRecord::Relation#extend_with"
+            end
+          end
+
+          # Non-destructively extends itself whith a hash of double-underscore'd conditions,
+          # where the last part "__" is MetaWhere operator (which is required), e.g.:
+          #     {:role__name__like => "%admin"}
+
+          def_dataset_method :extend_with_netzke_conditions do |cond|
+            cond.each_pair.inject(self) do |r, (k,v)|
+              assoc, method, *operator = k.to_s.split("__")
+              operator.empty? ? r.where(assoc.to_sym.send(method) => v) : r.where(assoc.to_sym => {method.to_sym.send(operator.last) => v}).joins(assoc.to_sym)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/netzke-basepack.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "netzke-basepack"
-  s.version = "0.7.4"
+  s.version = "0.7.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sergei Kozlov"]
-  s.date = "2012-03-05"
+  s.date = "2012-07-27"
   s.description = "A set of full-featured extendible Netzke components (such as FormPanel, GridPanel, Window, BorderLayoutPanel, etc) which can be used as building block for your RIA"
   s.email = "sergei@playcode.nl"
   s.extra_rdoc_files = [
@@ -18,14 +18,13 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".autotest",
+    ".travis.yml",
     "CHANGELOG.rdoc",
     "LICENSE",
     "README.md",
     "Rakefile",
     "TODO.rdoc",
-    "app/models/netzke_field_list.rb",
-    "app/models/netzke_model_attr_list.rb",
-    "app/models/netzke_persistent_array_auto_model.rb",
+    "config/ci/before-travis.sh",
     "init.rb",
     "install.rb",
     "javascripts/basepack.js",
@@ -47,6 +46,10 @@ Gem::Specification.new do |s|
     "lib/netzke/basepack/border_layout_panel.rb",
     "lib/netzke/basepack/border_layout_panel/javascripts/border_layout_panel.js",
     "lib/netzke/basepack/data_accessor.rb",
+    "lib/netzke/basepack/data_adapters/abstract_adapter.rb",
+    "lib/netzke/basepack/data_adapters/active_record_adapter.rb",
+    "lib/netzke/basepack/data_adapters/data_mapper_adapter.rb",
+    "lib/netzke/basepack/data_adapters/sequel_adapter.rb",
     "lib/netzke/basepack/form_panel.rb",
     "lib/netzke/basepack/form_panel/fields.rb",
     "lib/netzke/basepack/form_panel/javascripts/comma_list_cbg.js",
@@ -86,6 +89,14 @@ Gem::Specification.new do |s|
     "lib/netzke/basepack/window/javascripts/window.js",
     "lib/netzke/basepack/wrap_lazy_loaded.rb",
     "lib/netzke/basepack/wrapper.rb",
+    "lib/netzke/data_mapper.rb",
+    "lib/netzke/data_mapper/attributes.rb",
+    "lib/netzke/data_mapper/combobox_options.rb",
+    "lib/netzke/data_mapper/relation_extensions.rb",
+    "lib/netzke/sequel.rb",
+    "lib/netzke/sequel/attributes.rb",
+    "lib/netzke/sequel/combobox_options.rb",
+    "lib/netzke/sequel/relation_extensions.rb",
     "lib/tasks/netzke_basepack_tasks.rake",
     "locales/de.yml",
     "locales/en.yml",
@@ -96,6 +107,7 @@ Gem::Specification.new do |s|
     "test/basepack_test_app/.rvmrc",
     "test/basepack_test_app/Gemfile",
     "test/basepack_test_app/Gemfile.lock",
+    "test/basepack_test_app/Guardfile",
     "test/basepack_test_app/README",
     "test/basepack_test_app/Rakefile",
     "test/basepack_test_app/app/components/author_form.rb",
@@ -169,15 +181,18 @@ Gem::Specification.new do |s|
     "test/basepack_test_app/config/boot.rb",
     "test/basepack_test_app/config/cucumber.yml",
     "test/basepack_test_app/config/database.yml.sample",
+    "test/basepack_test_app/config/database.yml.travis",
     "test/basepack_test_app/config/environment.rb",
     "test/basepack_test_app/config/environments/development.rb",
     "test/basepack_test_app/config/environments/production.rb",
     "test/basepack_test_app/config/environments/test.rb",
     "test/basepack_test_app/config/initializers/backtrace_silencers.rb",
+    "test/basepack_test_app/config/initializers/data_mapper_logging.rb",
     "test/basepack_test_app/config/initializers/inflections.rb",
     "test/basepack_test_app/config/initializers/mime_types.rb",
     "test/basepack_test_app/config/initializers/netzke.rb",
     "test/basepack_test_app/config/initializers/secret_token.rb",
+    "test/basepack_test_app/config/initializers/sequel.rb",
     "test/basepack_test_app/config/initializers/session_store.rb",
     "test/basepack_test_app/config/locales/de.yml",
     "test/basepack_test_app/config/locales/es.yml",
@@ -224,6 +239,7 @@ Gem::Specification.new do |s|
     "test/basepack_test_app/features/window.feature",
     "test/basepack_test_app/lib/tasks/.gitkeep",
     "test/basepack_test_app/lib/tasks/cucumber.rake",
+    "test/basepack_test_app/lib/tasks/travis.rake",
     "test/basepack_test_app/public/404.html",
     "test/basepack_test_app/public/422.html",
     "test/basepack_test_app/public/500.html",
@@ -240,10 +256,11 @@ Gem::Specification.new do |s|
     "test/basepack_test_app/public/stylesheets/.gitkeep",
     "test/basepack_test_app/script/cucumber",
     "test/basepack_test_app/script/rails",
-    "test/basepack_test_app/spec/active_record/attributes_spec.rb",
-    "test/basepack_test_app/spec/active_record/relation_extensions_spec.rb",
     "test/basepack_test_app/spec/components/form_panel_spec.rb",
     "test/basepack_test_app/spec/components/grid_panel_spec.rb",
+    "test/basepack_test_app/spec/data_adapter/adapter_spec.rb",
+    "test/basepack_test_app/spec/data_adapter/attributes_spec.rb",
+    "test/basepack_test_app/spec/data_adapter/relation_extensions_spec.rb",
     "test/basepack_test_app/spec/factories.rb",
     "test/basepack_test_app/spec/spec_helper.rb",
     "test/basepack_test_app/test/performance/browsing_test.rb",
@@ -280,17 +297,11 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<netzke-core>, ["~> 0.7.4"])
-      s.add_runtime_dependency(%q<will_paginate>, ["~> 3.0.0"])
-      s.add_runtime_dependency(%q<acts_as_list>, ["~> 0.1.4"])
     else
       s.add_dependency(%q<netzke-core>, ["~> 0.7.4"])
-      s.add_dependency(%q<will_paginate>, ["~> 3.0.0"])
-      s.add_dependency(%q<acts_as_list>, ["~> 0.1.4"])
     end
   else
     s.add_dependency(%q<netzke-core>, ["~> 0.7.4"])
-    s.add_dependency(%q<will_paginate>, ["~> 3.0.0"])
-    s.add_dependency(%q<acts_as_list>, ["~> 0.1.4"])
   end
 end
 

data/test/basepack_test_app/Gemfile

@@ -1,34 +1,59 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.1.0'
+RAILS_VERSION = '3.2.1'
+DM_VERSION    = '1.2.0'
 
+# we are getting AR still regardless of ORM env, because netzke-persistence needs it
+gem 'rails',                RAILS_VERSION
 gem 'mysql2'
 
+case (ENV['ORM'] || '').downcase
+when 'dm'
+  # DataMapper
+  gem 'dm-rails',           DM_VERSION
+  gem 'dm-mysql-adapter',   DM_VERSION
+  gem 'dm-validations',     DM_VERSION # needed for manual validations
+  gem 'dm-timestamps',      DM_VERSION # needed for created_at and updated_at
+  gem 'dm-aggregates',      DM_VERSION # needed for efficient count queries, else * will be selected and counted afterwards
+when 'sq'
+  gem 'sequel'  
+end
+
 gem 'netzke-core',        :path => File.expand_path('../vendor/gems/netzke-core', __FILE__)
 gem 'netzke-persistence', :path => File.expand_path('../vendor/gems/netzke-persistence', __FILE__)
 
 # We need to manually include these Basepack dependencies, because we're not including Basepack as a gem
-gem 'will_paginate', '~>3.0'
-gem 'acts_as_list'
+# gem 'will_paginate', :git=> "git://github.com/mislav/will_paginate.git"
+
 
 # Bundle gems for the local environment. Make sure to
 # put test-only gems in this group so their generators
 # and rake tasks are available in development mode:
 group :development, :test do
+  gem 'pry'
+  gem 'thin'
   gem 'capybara'
+  gem 'capybara-screenshot'
   gem 'cucumber-rails'
   gem 'cucumber'
+  gem 'selenium-webdriver', '2.17.0'
   gem 'rspec-rails'
   gem 'spork'
   gem 'launchy'    # So you can do Then show me the page
   gem 'factory_girl'
 end
 
-group :development do
-end
-
 group :test do
   gem 'sqlite3-ruby', :require => 'sqlite3'
-  gem 'pickle'
+  case (ENV['ORM'] || '').downcase
+  when 'dm'
+    # if we are using dm, we need the sqlite adapter
+    gem 'dm-sqlite-adapter', DM_VERSION
+  else
+    # default case: use ar
+    # nothing to do here
+  end
+  # pickle branch with sequel support
+  gem 'pickle', :git=>'git://github.com/NZX/pickle.git'
   gem 'database_cleaner'
-end
+end

data/test/basepack_test_app/Gemfile.lock

@@ -1,7 +1,17 @@
+GIT
+  remote: git://github.com/NZX/pickle.git
+  revision: 71421eb9de6aaa81268fb9aa73682c05d3b4cb74
+  specs:
+    pickle (0.4.4)
+      cucumber (>= 0.8)
+      rake
+      rspec (>= 1.3)
+      yard
+
 PATH
   remote: vendor/gems/netzke-core
   specs:
-    netzke-core (0.7.4)
+    netzke-core (0.7.5)
       activesupport (>= 3.0.0)
 
 PATH
@@ -12,39 +22,35 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.0)
-      actionpack (= 3.1.0)
-      mail (~> 2.3.0)
-    actionpack (3.1.0)
-      activemodel (= 3.1.0)
-      activesupport (= 3.1.0)
+    actionmailer (3.2.1)
+      actionpack (= 3.2.1)
+      mail (~> 2.4.0)
+    actionpack (3.2.1)
+      activemodel (= 3.2.1)
+      activesupport (= 3.2.1)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.2)
-      rack-cache (~> 1.0.3)
-      rack-mount (~> 0.8.2)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.1)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.0.0)
-    activemodel (3.1.0)
-      activesupport (= 3.1.0)
-      bcrypt-ruby (~> 3.0.0)
+      sprockets (~> 2.1.2)
+    activemodel (3.2.1)
+      activesupport (= 3.2.1)
       builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.0)
-      activemodel (= 3.1.0)
-      activesupport (= 3.1.0)
-      arel (~> 2.2.1)
+    activerecord (3.2.1)
+      activemodel (= 3.2.1)
+      activesupport (= 3.2.1)
+      arel (~> 3.0.0)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.0)
-      activemodel (= 3.1.0)
-      activesupport (= 3.1.0)
-    activesupport (3.1.0)
+    activeresource (3.2.1)
+      activemodel (= 3.2.1)
+      activesupport (= 3.2.1)
+    activesupport (3.2.1)
+      i18n (~> 0.6)
       multi_json (~> 1.0)
-    acts_as_list (0.1.4)
-    addressable (2.2.6)
-    arel (2.2.1)
-    bcrypt-ruby (3.0.1)
+    addressable (2.2.7)
+    arel (3.0.2)
     builder (3.0.0)
     capybara (1.1.2)
       mime-types (>= 1.16)
@@ -53,63 +59,69 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 0.1.4)
-    childprocess (0.2.8)
+    capybara-screenshot (0.1.10)
+      capybara (>= 1.0)
+    childprocess (0.3.1)
       ffi (~> 1.0.6)
-    cucumber (1.1.4)
+    coderay (1.0.5)
+    cucumber (1.1.9)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      gherkin (~> 2.7.1)
+      gherkin (~> 2.9.0)
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.6)
-    cucumber-rails (1.2.1)
+    cucumber-rails (1.3.0)
       capybara (>= 1.1.2)
-      cucumber (>= 1.1.3)
+      cucumber (>= 1.1.8)
       nokogiri (>= 1.5.0)
-    database_cleaner (0.7.0)
+    daemons (1.1.8)
+    database_cleaner (0.7.2)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    factory_girl (2.3.2)
-      activesupport
+    eventmachine (0.12.10)
+    factory_girl (3.0.0)
+      activesupport (>= 3.0.0)
     ffi (1.0.11)
-    gherkin (2.7.2)
+    gherkin (2.9.1)
       json (>= 1.4.6)
     hike (1.2.1)
     i18n (0.6.0)
-    json (1.6.4)
-    launchy (2.0.5)
+    journey (1.0.3)
+    json (1.6.5)
+    launchy (2.1.0)
       addressable (~> 2.2.6)
-    mail (2.3.0)
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.17.2)
+    method_source (0.7.1)
+    mime-types (1.18)
     multi_json (1.0.4)
     mysql2 (0.3.11)
-    nokogiri (1.5.0)
-    pickle (0.4.10)
-      cucumber (>= 0.8)
-      rake
+    nokogiri (1.5.2)
     polyglot (0.3.3)
-    rack (1.3.6)
-    rack-cache (1.0.3)
+    pry (0.9.8.4)
+      coderay (~> 1.0.5)
+      method_source (~> 0.7.1)
+      slop (>= 2.4.4, < 3)
+    rack (1.4.1)
+    rack-cache (1.2)
       rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
     rack-ssl (1.3.2)
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.1.0)
-      actionmailer (= 3.1.0)
-      actionpack (= 3.1.0)
-      activerecord (= 3.1.0)
-      activeresource (= 3.1.0)
-      activesupport (= 3.1.0)
+    rails (3.2.1)
+      actionmailer (= 3.2.1)
+      actionpack (= 3.2.1)
+      activerecord (= 3.2.1)
+      activeresource (= 3.2.1)
+      activesupport (= 3.2.1)
       bundler (~> 1.0)
-      railties (= 3.1.0)
-    railties (3.1.0)
-      actionpack (= 3.1.0)
-      activesupport (= 3.1.0)
+      railties (= 3.2.1)
+    railties (3.2.1)
+      actionpack (= 3.2.1)
+      activesupport (= 3.2.1)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -117,27 +129,28 @@ GEM
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-    rspec-rails (2.8.1)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
+    rspec-rails (2.9.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec (~> 2.8.0)
-    rubyzip (0.9.5)
-    selenium-webdriver (2.16.0)
+      rspec (~> 2.9.0)
+    rubyzip (0.9.6.1)
+    selenium-webdriver (2.17.0)
       childprocess (>= 0.2.5)
       ffi (~> 1.0.9)
       multi_json (~> 1.0.4)
       rubyzip
-    spork (0.8.5)
-    sprockets (2.0.3)
+    slop (2.4.4)
+    spork (0.9.0)
+    sprockets (2.1.2)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
@@ -145,22 +158,26 @@ GEM
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
     term-ansicolor (1.0.7)
+    thin (1.3.1)
+      daemons (>= 1.0.9)
+      eventmachine (>= 0.12.6)
+      rack (>= 1.0.0)
     thor (0.14.6)
     tilt (1.3.3)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
-    will_paginate (3.0.2)
+    tzinfo (0.3.32)
     xpath (0.1.4)
       nokogiri (~> 1.3)
+    yard (0.7.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  acts_as_list
   capybara
+  capybara-screenshot
   cucumber
   cucumber-rails
   database_cleaner
@@ -169,9 +186,11 @@ DEPENDENCIES
   mysql2
   netzke-core!
   netzke-persistence!
-  pickle
-  rails (= 3.1.0)
+  pickle!
+  pry
+  rails (= 3.2.1)
   rspec-rails
+  selenium-webdriver (= 2.17.0)
   spork
   sqlite3-ruby
-  will_paginate (~> 3.0)
+  thin