netzke-basepack 0.7.4 → 0.7.5

data/test/basepack_test_app/features/grid_sorting.feature

@@ -13,11 +13,11 @@ Feature: Grid sorting
 
     When I go to the BookGrid test page
     And I click on column "Title"
-    And I sleep 1 second
+    And I wait for the response from the server
     Then the grid should have records sorted by "Title"
 
     When I click on column "Title"
-    And I sleep 1 second
+    And I wait for the response from the server
     Then the grid should have records sorted by "Title" desc
 
   @javascript
@@ -31,17 +31,17 @@ Feature: Grid sorting
 
     When I go to the BookGridWithCustomColumns test page
     And I click on column "Author  first name"
-    And I sleep 1 second
+    And I wait for the response from the server
     Then the grid should have records sorted by "Author  first name"
 
     When I click on column "Author  first name"
-    And I sleep 1 second
+    And I wait for the response from the server
     Then the grid should have records sorted by "Author  first name" desc
 
     When I go to the BookGrid test page
     And I click on column "Author  name"
-    And I sleep 1 second
+    And I wait for the response from the server
     Then the grid should have records sorted by "Author  name"
     When I click on column "Author  name"
-    And I sleep 1 second
+    And I wait for the response from the server
     Then the grid should have records sorted by "Author  name" desc

data/test/basepack_test_app/features/paging_form_panel.feature

@@ -23,19 +23,19 @@ Scenario: Paging through records
   And  I wait for the response from the server
   Then the form should show title: "Getting Things Done"
 
-@javascript
-Scenario: Searching
-  When I go to the BookPagingFormPanel test page
-  And I press "Search"
-  And I wait for the response from the server
-  And I expand combobox "undefined_attr"
-  And I select "Exemplars" from combobox "undefined_attr"
-  And I expand combobox "exemplars_operator"
-  And I select "Less than" from combobox "exemplars_operator"
-  And I fill in "exemplars_value" with "5"
-  And I press "Search" within "#book_paging_form_panel__search_form"
-  And I wait for the response from the server
-  Then the form should show title: "Getting Things Done"
+#@javascript
+#Scenario: Searching
+  #When I go to the BookPagingFormPanel test page
+  #And I press "Search"
+  #And I wait for the response from the server
+  #And I expand combobox "undefined_attr"
+  #And I select "Exemplars" from combobox "undefined_attr"
+  #And I expand combobox "exemplars_operator"
+  #And I select "Less than" from combobox "exemplars_operator"
+  #And I fill in "exemplars_value" with "5"
+  #And I press "Search" within "#book_paging_form_panel__search_form"
+  #And I wait for the response from the server
+  #Then the form should show title: "Getting Things Done"
 
 @javascript
 Scenario: I must see total records value

data/test/basepack_test_app/features/search_in_grid.feature

@@ -1,35 +1,35 @@
-Feature: Search
-  In order to value
-  As a role
-  I want feature
+#Feature: Search
+  #In order to value
+  #As a role
+  #I want feature
 
-  @javascript
-  Scenario: Search via Search window
-    Given the following roles exist:
-    | id | name       |
-    | 1  | admin      |
-    | 2  | superadmin |
-    | 3  | user       |
+  #@javascript
+  #Scenario: Search via Search window
+    #Given the following roles exist:
+    #| id | name       |
+    #| 1  | admin      |
+    #| 2  | superadmin |
+    #| 3  | user       |
 
-    And the following users exist:
-    | first_name | last_name | role_id |
-    | Paul       | Bley      | 1       |
-    | Dalai      | Lama      | 3       |
-    | Taisha     | Abelar    | 2       |
-    | Florinda   | Donner    | 1       |
+    #And the following users exist:
+    #| first_name | last_name | role_id |
+    #| Paul       | Bley      | 1       |
+    #| Dalai      | Lama      | 3       |
+    #| Taisha     | Abelar    | 2       |
+    #| Florinda   | Donner    | 1       |
 
-    When I go to the UserGrid test page
-    Then the grid should show 4 records
+    #When I go to the UserGrid test page
+    #Then the grid should show 4 records
 
-    When I press "Search"
-    And I wait 1 second
-    And I expand combobox "undefined_attr"
-    And I select "First name" from combobox "undefined_attr"
-    And I wait 1 second
-    And I fill in "first_name_value" with "ai"
-    And I press "Search" within "#user_grid__search_form"
-    And I sleep 1 second
-    Then the grid should show 2 records
+    #When I press "Search"
+    #And I wait for the response from the server
+    #And I expand combobox "undefined_attr"
+    #And I select "First name" from combobox "undefined_attr"
+    #And I wait for the response from the server
+    #And I fill in "first_name_value" with "ai"
+    #And I press "Search" within "#user_grid__search_form"
+    #And I wait for the response from the server
+    #Then the grid should show 2 records
 
     # When I press "Search"
     # And I follow "+"
@@ -37,7 +37,7 @@ Feature: Search
     # And I select "First name" from combobox "undefined_attr"
     # And I fill in "first_name_value" with "in"
     # And I press "Search" within "#user_grid__search_form"
-    # And I sleep 1 second
+    # And I wait for the response from the server
     # Then the grid should show 3 records
 
     # Search on association column not supported yet
@@ -45,5 +45,5 @@ Feature: Search
     # And I fill in "Role name like:" with "adm"
     # And I fill in "First name like:" with ""
     # And I press "Search" within "#user_grid__search_form"
-    # And I sleep 1 second
-    # Then the grid should show 3 records
+    # And I wait for the response from the server
+    # Then the grid should show 3 records

data/test/basepack_test_app/features/step_definitions/generic_steps.rb

@@ -15,7 +15,9 @@ When /I (?:sleep|wait) (\d+) (\w+)/ do |amount, unit|
 end
 
 When /^I wait for the response from the server$/ do
-  page.wait_until{ page.driver.browser.execute_script("return !Netzke.ajaxIsLoading()") }
+  sleep 0.5
+  page.wait_until{ page.driver.browser.execute_script("return !(Netzke.ajaxIsLoading() || Ext.Ajax.isLoading())") }
+  sleep 0.5
 end
 
 When /^I go forward one page$/ do

data/test/basepack_test_app/features/support/env.rb

@@ -23,9 +23,14 @@ require 'capybara/cucumber'
 require 'capybara/session'
 # require 'cucumber/rails/capybara_javascript_emulation' # Lets you click links with onclick javascript handlers without using @culerity or @javascript
 
-# Capybara.register_driver :selenium do |app|
-#   Capybara::Driver::Selenium.new(app, {:profile => 'selenium' } )
-# end
+# resynchronize after ajax call
+# from README at (https://github.com/jnicklas/capybara)
+Capybara.register_driver :selenium do |app|
+  Capybara::Selenium::Driver.new(app, {:resynchronize => true } )
+end
+
+# wait a bit longer (default 2s)
+Capybara.default_wait_time = 5
 
 # Capybara defaults to XPath selectors rather than Webrat's default of CSS3. In
 # order to ease the transition to Capybara we set the default here. If you'd
@@ -56,13 +61,21 @@ ActionController::Base.allow_rescue = false
 # after each scenario, which can lead to hard-to-debug failures in
 # subsequent scenarios. If you do this, we recommend you create a Before
 # block that will explicitly put your database in a known state.
-Cucumber::Rails::World.use_transactional_fixtures = true
 # How to clean your database when transactions are turned off. See
 # http://github.com/bmabey/database_cleaner for more info.
 if defined?(ActiveRecord::Base)
   begin
     require 'database_cleaner'
     DatabaseCleaner.strategy = :truncation
+    Cucumber::Rails::World.use_transactional_fixtures = true
+  rescue LoadError => ignore_if_database_cleaner_not_present
+  end
+end
+
+if defined?(DataMapper::Resource)
+  begin
+    require 'database_cleaner'
+    DatabaseCleaner[:data_mapper].strategy = :truncation
   rescue LoadError => ignore_if_database_cleaner_not_present
   end
 end

data/test/basepack_test_app/lib/tasks/travis.rake

@@ -0,0 +1,7 @@
+task :travis do
+  ["rake spec", "rake cucumber"].each do |cmd|
+    puts "Starting to run #{cmd}..."
+    system("export DISPLAY=:99.0 && bundle exec #{cmd}")
+    raise "#{cmd} failed!" unless $?.exitstatus == 0
+  end
+end

data/test/basepack_test_app/spec/components/form_panel_spec.rb

@@ -16,7 +16,7 @@ describe Netzke::Basepack::FormPanel do
     form = Netzke::Basepack::FormPanel.new(:model => 'User', :items => [:first_name, :created_at, :role__name])
 
     form.fields[:first_name][:xtype].should == :textfield
-    form.fields[:created_at][:xtype].should == :datetimefield
+    form.fields[:created_at][:xtype].should == :xdatetime
     form.fields[:role__name][:xtype].should == :netzkeremotecombo
   end
 
@@ -50,4 +50,4 @@ describe Netzke::Basepack::FormPanel do
     form.items[3][:name].should == "updated_at"
   end
 
-end
+end

data/test/basepack_test_app/spec/data_adapter/adapter_spec.rb

@@ -0,0 +1,68 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+if defined? DataMapper::Resource
+
+  Book.class_eval do
+
+    def self.title_like_jou
+      all(:title.like => "Jou%")
+    end
+
+    def self.author_name_like_he
+      all(Author.last_name.like => "He%")
+    end
+  end
+
+elsif defined? Sequel::Model
+
+  Book.class_eval do
+    def_dataset_method(:title_like_jou) do
+      where(:title.like("Jou%"))
+    end
+
+    def_dataset_method(:author_name_like_he) do
+      eager_graph(:author).where(:author__name.like("He%"))
+    end
+  end
+
+else
+
+  Book.class_eval do
+    scope :title_like_jou, where("title LIKE 'Jou%'")
+    scope :author_name_like_he, joins(:author).where("authors.last_name LIKE 'He%'")
+  end
+
+end
+
+adapter_class=Netzke::Basepack::DataAdapters::AbstractAdapter.adapter_class(Book)
+describe adapter_class do
+
+  before :all do
+    castaneda = Factory(:author, {:first_name => "Carlos", :last_name => "Castaneda"})
+    hesse = Factory(:author, {:first_name => "Herman", :last_name => "Hesse"})
+
+    Factory(:book, {:title => "Journey to Ixtlan", :author => castaneda})
+    Factory(:book, {:title => "The Tales of Power", :author => castaneda})
+    Factory(:book, {:title => "The Art of Dreaming", :author => castaneda})
+    Factory(:book, {:title => "Steppenwolf", :author => hesse})
+    Factory(:book, {:title => "Demian", :author => hesse})
+    Factory(:book, {:title => "Narciss and Goldmund", :author => hesse})
+
+    @adapter = adapter_class.new(Book)
+  end
+
+  it "should return a hash fk to model" do
+    @adapter.hash_fk_model.should == {:author_id => :author}
+  end
+
+  it "should report correct record count when filters are specified" do
+    @adapter.count_records({:filter=>ActiveSupport::JSON.encode([{'field' => 'title', 'value' => 'Journ', 'type' => 'string', 'comparsion' => 'matches' }])}).should == 1
+  end
+
+  it "should report correct record count when filters on association columns are specified" do
+    @adapter.count_records({:filter=>ActiveSupport::JSON.encode([{'field' => 'author__last_name', 'value' => 'Cast', 'type' => 'string', 'comparsion' => 'matches' }])},[{:name => 'author__last_name'}]).should == 3
+  end
+
+  # TODO: test scope and query for assoc columns and non-assoc columns
+
+end

data/test/basepack_test_app/spec/{active_record → data_adapter}/attributes_spec.rb

@@ -2,18 +2,18 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Netzke::ActiveRecord::Attributes do
   it "should return Netzke attributes in natural order" do
-    User.send(:netzke_attrs_in_natural_order).map{ |a| a[:name] }.should == %w(id first_name last_name role__name created_at updated_at)
+    User.send(:netzke_attrs_in_natural_order).map{ |a| a[:name] }.should =~ %w(id first_name last_name role__name created_at updated_at)
   end
 
   it "should return exposed Netzke attributes" do
     class UserExt < User
       netzke_expose_attributes :first_name, :created_at
     end
-    UserExt.netzke_attributes.map{ |a| a[:name] }.should == %w(id first_name created_at)
+    UserExt.netzke_attributes.map{ |a| a[:name] }.should =~ %w(id first_name created_at)
   end
 
   it "should return Netzke attributes including an association attribute represented by a virtual method" do
-    Book.netzke_attributes.map{ |a| a[:name] }.should == %w(id author__name title exemplars digitized notes tags rating created_at updated_at)
+    Book.netzke_attributes.map{ |a| a[:name] }.should =~ %w(id author__name title exemplars digitized notes tags rating created_at updated_at last_read_at published_on)
     Book.netzke_attributes.detect{ |a| a[:name] == "author__name" }[:attr_type].should == :string
   end
 
@@ -27,6 +27,7 @@ describe Netzke::ActiveRecord::Attributes do
     author = Factory(:author)
     book = Factory(:book, :author => author)
     book.set_value_for_attribute({:name => :author__first_name, :nested_attribute => true}, "Carlitos")
+    author.reload if defined? Sequel::Model
     author.first_name.should == "Carlitos"
   end
 
@@ -40,9 +41,16 @@ describe Netzke::ActiveRecord::Attributes do
 
   it "should be possible to change address of a user (has_one association) via association attribute without specifying :nested_attribute => true" do
     address = Factory(:address)
-    user = Factory(:user, :address => address)
+    user = Factory(:user)
+    user.address = address
     user.set_value_for_attribute({:name => :address__city}, "Hidden Treasures")
     address.city.should == "Hidden Treasures"
   end
 
+  it "should consider netzke_attributes, normalize date formats and niftify on #netzke_json" do
+    Time.zone = 'UTC'
+    author = Factory(:author, :created_at => Time.zone.at(0), :updated_at => Time.zone.at(0))
+    author.netzke_json.should == "{\"id\":#{author.id},\"firstName\":\"Carlos\",\"lastName\":\"Castaneda\",\"createdAt\":\"1970-01-01 00:00:00\",\"updatedAt\":\"1970-01-01 00:00:00\",\"name\":\"Castaneda, Carlos\"}"
+  end
+
 end

data/test/basepack_test_app/spec/data_adapter/relation_extensions_spec.rb

@@ -0,0 +1,125 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+if defined? DataMapper::Resource
+
+  User.class_eval do
+
+    def self.role_id_gt_7
+      all(:role_id.gt => 7)
+    end
+
+    def self.role_id_gt param
+      all(:role_id.gt => param)
+    end
+  end
+
+  describe Netzke::DataMapper::RelationExtensions do
+    it "should accept different options in extend_with" do
+      # Preparations
+      10.times do |i|
+        Factory(:user, :first_name => "First Name #{i}", :role_id => i)
+      end
+
+      # Tests
+
+      User.all.extend_with(:role_id_gt_7).count.should == 2
+
+      User.all.extend_with(:role_id_gt, 2).count.should == 7
+
+      User.all.extend_with([:role_id_gt, 3]).count.should == 6
+
+      User.all.extend_with(:role_id => 5).first.first_name.should == "First Name 5"
+
+      User.all(:role_id.lt => 7).extend_with(lambda{ |relation| relation.all( :role_id.gt => 4)}).count.should == 2
+
+      #Not supported in DM
+      lambda { User.all.extend_with("select * from users where role_id > 6") }.should raise_error NotImplementedError
+      lambda { User.all.extend_with(["role_id >= ?", 5]).count }.should raise_error NotImplementedError
+    end
+  end
+
+elsif defined? Sequel::Model
+
+  User.class_eval do
+
+    def_dataset_method(:role_id_gt_7) do
+      where{role_id > 7}
+    end
+
+    def_dataset_method(:role_id_gt) do |p|
+      where{role_id > p}
+    end
+
+  end
+
+  describe Netzke::Sequel::RelationExtensions do
+    it "should accept different options in extend_with" do
+      # Preparations
+      10.times do |i|
+        Factory(:user, :first_name => "First Name #{i}", :role_id => i)
+      end
+
+      # Tests
+
+      User.extend_with(:role_id_gt_7).count.should == 2
+      User.extend_with(:role_id_gt, 2).count.should == 7
+      User.extend_with([:role_id_gt, 3]).count.should == 6
+      User.extend_with(:role_id => 5).first.first_name.should == "First Name 5"
+      User.where{role_id < 7}.extend_with(lambda{ |dataset| dataset.where{ role_id > 4}}).count.should == 2
+      User.extend_with("role_id > 6").count.should == 3
+      User.extend_with(["role_id >= ?", 5]).count.should == 5
+
+    end
+  end
+
+else
+
+  User.class_eval do
+    scope :role_id_gt_7, where("role_id > 7")
+    scope :role_id_gt, lambda { |param| where("role_id > ?", param) }
+  end
+
+  describe  Netzke::ActiveRecord::RelationExtensions do
+    it "should accept different options in extend_with" do
+      # Preparations
+      10.times do |i|
+        Factory(:user, :first_name => "First Name #{i}", :role_id => i)
+      end
+
+      # Tests
+      User.where({}).extend_with(["role_id >= ?", 5]).count.should == 5
+
+      User.where({}).extend_with(:role_id_gt_7).count.should == 2
+
+      User.where({}).extend_with(:role_id_gt, 2).count.should == 7
+
+      User.where({}).extend_with([:role_id_gt, 3]).count.should == 6
+
+      User.where({}).extend_with(:role_id => 5).first.first_name.should == "First Name 5"
+
+      User.where(["role_id < ?", 7]).extend_with(lambda{ |relation| relation.where(["role_id > ?", 4]) }).count.should == 2
+
+      #User.where({}).extend_with("select * from users where role_id > 6").all.size.should == 3
+
+    end
+  end
+
+
+end
+
+
+  #it "should be extendable with extend_with_netzke_conditions" do
+    ## Preparations
+    #roles = [Factory(:role, :name => "admin"), Factory(:role, :name => "user"), Factory(:role, :name => "superadmin")]
+
+    ## 3 users of each role
+    #9.times do |i|
+      #Factory(:user, :role_id => roles[i%3].id)
+    #end
+
+    ## Tests
+    ## User.where({}).extend_with_netzke_conditions(:role_id__eq => roles.last.id).count.should == 3
+    ## User.where({}).extend_with_netzke_conditions(:role_name__eq => "admin").count.should == 3
+    ## User.where({}).extend_with_netzke_conditions(:role__name__like => "%admin%").count.should == 6
+  #end
+