ule_page 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e65f28565e0f3af28604df08b479c7d1b9002a03
-  data.tar.gz: 32c8780a7e57eadda48defecbf145d57ea3e5387
+  metadata.gz: 84e8d3bd9a14c739a5d257450127c8ca81910e04
+  data.tar.gz: b467022839fe9088bb302dc613da08752aec8c9a
 SHA512:
-  metadata.gz: 8e9fb84072c2037e43666430e9cd4d927d0093b9f10699bb1661128ef95f72f056a03f58258978f0f7f39b5a3ff14d74c636ccd30d16a0c2c435a56a91f7ccbf
-  data.tar.gz: 443d1fc5472baf0a06fc83b383f0e91c613649f85ec1e241fa6f69560ec64d02949466ea629e07858ce29b63e92deed8c4ef4f7ee617842ee3b5c9712c737dd1
+  metadata.gz: 490ce1aefc7e129cbbf98c9d2717a4694e41136f4d72b895aa7b5068a31051a79c42abf77dbdf387be1dcda9d67ca3eb2c0bfa8242da33771f6d9aa6f6813f6d
+  data.tar.gz: a2063f05613e356affcad38e177f5d1daa46ad9add5a7f8373b6d54c010df4ab530d608ad0688c3ff8fa2c54147afb20cca6a0198d6f8865a5dbf033346e9c79

data/Gemfile

@@ -1,5 +1,5 @@
-# source 'https://rubygems.org'
-source 'https://ruby.taobao.org'
+source 'https://rubygems.org'
+#source 'https://ruby.taobao.org'
 
 # Specify your gem's dependencies in ule_page.gemspec
 gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ule_page (0.0.2)
+    ule_page (0.0.3)
       activerecord (> 4.0)
       activesupport (> 4.0)
       capybara (>= 2.1, < 3.0)
@@ -9,7 +9,7 @@ PATH
       site_prism (> 2.1)
 
 GEM
-  remote: https://ruby.taobao.org/
+  remote: https://rubygems.org/
   specs:
     actionmailer (4.2.5.1)
       actionpack (= 4.2.5.1)

data/README.md

@@ -2,7 +2,7 @@
 
 Welcome to UlePage gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/ule_page`. To experiment with that code, run `bin/console` for an interactive prompt.
 
-Using UlePage, you can define page model object easily. e.g.
+Using UlePage, you can define page model object easily and the gem can match the current url to the specific page model with 'pg' method. e.g.
 ```ruby
 module Page
   module Customers
@@ -15,9 +15,25 @@ module Page
         submit
       end
     end
+
+    class Index < UlePage::Index
+      set_urls '/customers', '/organization/:organization_id/customers'
+
+      def has_customer?(customer)
+        check_have_hashtable_content customer, [ :name, :phone, :address ]
+      end
+
+    end
   end
 end
 
+Given(/^home page has something$/) do |table|
+  visit '/'
+  click_link 'customers' # goto customer index pages.
+
+  pg.has_customer? table.hashes[0] # called customer index page method.
+end
+
 ```
 
 ## Installation
@@ -44,7 +60,7 @@ UlePage.setup do |config|
   #add customised content
 end
 ```
-# Important:
+### Important:
 Make sure the above lines in front of the screenshot requiring, or you can not get screenshot when you get errors.
 ```ruby
 require 'capybara-screenshot/cucumber'
@@ -53,14 +69,6 @@ And in features/support/helper.rb, add lines:
 ```ruby
   include UlePage::Helper
 
-  def pg
-    special_maps = {
-      '/' => Page::Homes::Index.new # or something else, based on your page model
-    }
-
-    return UlePage::ModelMatch.get_current_page_with_wait special_maps
-  end
-
 ```
 After that, you can define your page model.
 
@@ -73,8 +81,26 @@ UlePage will map crud page model automatically, say, if you have a model custome
   '/customers/:id/edit' => Page::Customers::Edit
 }
 ```
+If the page model is not the CRUD with simple, you can set urls manually on the page model.
+```ruby
+class Index < UlePage::Index
+  set_urls '/orders', '/customer/:customer_id/orders'
+
+  # ...
+end
+
+```
+
+
 In cucumber step files, you can use pg.xxx, pg will get your defined model automatically via current_url.
 
+```ruby
+Given(/^home page has something$/) do
+  visit '/'
+  pg.has_something # you need to implement has_something method in the home_page page model.
+end
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/ule_page/helper.rb

@@ -2,6 +2,9 @@ require 'capybara'
 
 module UlePage
   module Helper
+    def pg
+      UlePage::ModelMatch.get_current_page_with_wait {}
+    end
 
     def wait_for_ajax
       page.has_css?('.pace-small .pace-inactive')

data/lib/ule_page/model_match.rb

@@ -12,7 +12,7 @@ module UlePage
         current = get_current_page special_maps
 
         if !current_path.nil? && current.nil?
-          p "current path is #{current_path}, we can not get the page model, please add it to the get_current_page map. (helper.rb)"
+          p "current path is #{current_path}, we can not get the page model, please define the set_urls for the page model."
 
           raise
         end
@@ -21,35 +21,8 @@ module UlePage
       end
 
       def get_current_page(special_maps = {})
-        resources = UlePage.resource_models || []
+        map = prepare_maps special_maps
 
-        if !UlePage.map_initialized || UlePage.special_maps.empty?
-          UlePage.special_maps = special_maps
-          UlePage.map = UlePage.special_maps
-
-          # => to generate the following
-          # '/customers' => Page::Customers::Index.new,
-          # '/customers/new' => Page::Customers::Create.new,
-          # '/customers/:id' => Page::Customers::Details.new,
-          # '/customers/:id/edit' => Page::Customers::Edit.new,
-          resources.each do |model|
-
-            pluralized = model.to_s.underscore.pluralize
-            page_module_name = model.to_s.pluralize.camelize
-
-            next unless Object.const_defined?("#{UlePage.module_name}::#{page_module_name}")
-
-            page_module = Object.const_get(UlePage.module_name).const_get(page_module_name)
-            UlePage.map["/#{pluralized}"] = page_module.const_get("Index").try(:new) rescue false
-            UlePage.map["/#{pluralized}/new"] = page_module.const_get("Create").new rescue false
-            UlePage.map["/#{pluralized}/:id"] = page_module.const_get("Details").new rescue false
-            UlePage.map["/#{pluralized}/:id/edit"] = page_module.const_get("Edit").new rescue false
-          end
-
-          UlePage.map_initialized = true
-        end
-
-        map = UlePage.map
         return nil unless current_path
 
         current = get_model map, current_path
@@ -61,6 +34,22 @@ module UlePage
         current
       end
 
+      def prepare_maps(special_maps)
+        if !UlePage.map_initialized || UlePage.special_maps.empty?
+          UlePage.special_maps = special_maps
+          UlePage.map = {}
+
+          generate_map_by_convention UlePage.map, UlePage.resource_models
+
+          UlePage.map.merge! UlePage.special_maps if UlePage.special_maps.any?
+          UlePage.map.merge! UlePage::PageMap.instance.pages
+
+          UlePage.map_initialized = true
+        end
+
+        UlePage.map
+      end
+
       def get_model(map, path)
         map[path] || try_regex_match(map, path)
       end
@@ -78,6 +67,29 @@ module UlePage
 
         nil
       end
+
+      private
+      def generate_map_by_convention(map, resources)
+        resources ||= []
+        # => to generate the following
+        # '/customers' => Page::Customers::Index.new,
+        # '/customers/new' => Page::Customers::Create.new,
+        # '/customers/:id' => Page::Customers::Details.new,
+        # '/customers/:id/edit' => Page::Customers::Edit.new,
+        resources.each do |model|
+
+          pluralized = model.to_s.underscore.pluralize
+          page_module_name = model.to_s.pluralize.camelize
+
+          next unless Object.const_defined?("#{UlePage.module_name}::#{page_module_name}")
+
+          page_module = Object.const_get(UlePage.module_name).const_get(page_module_name)
+          map["/#{pluralized}"] = page_module.const_get("Index").try(:new) rescue false
+          map["/#{pluralized}/new"] = page_module.const_get("Create").new rescue false
+          map["/#{pluralized}/:id"] = page_module.const_get("Details").new rescue false
+          map["/#{pluralized}/:id/edit"] = page_module.const_get("Edit").new rescue false
+        end
+      end
     end
   end
 end

data/lib/ule_page/page.rb

@@ -4,6 +4,7 @@ require 'rspec/expectations'
 require 'capybara'
 require 'ule_page/site_prism_extender'
 require 'ule_page/helper'
+require 'ule_page/page_map'
 require 'active_support/inflector'
 
 module UlePage
@@ -13,6 +14,17 @@ module UlePage
     extend UlePage::SitePrismExtender
     include RSpec::Matchers
 
+    @urls  = []
+    def self.set_urls(*urls)
+      @urls = urls
+      add_to_page_map @urls
+      set_first_url
+    end
+
+    def self.urls
+      @urls
+    end
+
     # e.g. is_order_detail?
     def self.inherited(subclass)
       method_name = "is_#{subclass.parent.name.demodulize.singularize.underscore}_#{subclass.name.demodulize.singularize.underscore}?"
@@ -114,7 +126,19 @@ module UlePage
     def go_back
       click_link_or_button '返回'
     end
-  end
 
+    private
+    def self.add_to_page_map(urls = [])
+      urls.each {|x| PageMap.instance.pages[x] = self.new } unless urls.nil?
+    end
 
+    def self.set_first_url
+      if @urls.any?
+        first_url = @urls.first
+        first_url = first_url.gsub /:(\w+)/, '{\1}'
+        set_url first_url
+      end
+    end
+
+  end
 end

data/lib/ule_page/page_map.rb

@@ -0,0 +1,15 @@
+require 'singleton'
+
+module UlePage
+  class PageMap
+    include Singleton
+
+    def initialize
+      @map = {}
+    end
+
+    def pages
+      @map
+    end
+  end
+end

data/lib/ule_page/version.rb

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

data/lib/ule_page.rb

@@ -1,6 +1,7 @@
 require "ule_page/version"
 require 'rails'
 require 'active_record'
+require 'ule_page/page_map'
 require 'site_prism'
 
 module UlePage

data/ule_page.gemspec

@@ -10,10 +10,11 @@ Gem::Specification.new do |spec|
   spec.email         = ["tsuijy@gmail.com"]
 
   spec.summary       = %q{ Page model for cucumber test.}
-  spec.description   = %q{ Based on the siteprism gem, add more page methods.}
+  spec.description   = %q{ Based on the siteprism gem, add more page methods and looking for page model via current_path.}
   spec.homepage      = "https://github.com/jerecui/ule_page"
   spec.license       = "MIT"
 
+
   # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
   # delete this section to allow pushing this gem to any host.
   # if spec.respond_to?(:metadata)
@@ -27,6 +28,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = '>= 1.9.3'
+  spec.platform    = Gem::Platform::RUBY
+
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency("activesupport")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ule_page
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Jeremy Cui
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-24 00:00:00.000000000 Z
+date: 2016-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -226,7 +226,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: " Based on the siteprism gem, add more page methods."
+description: " Based on the siteprism gem, add more page methods and looking for page
+  model via current_path."
 email:
 - tsuijy@gmail.com
 executables: []
@@ -252,6 +253,7 @@ files:
 - lib/ule_page/models/detail.rb
 - lib/ule_page/models/index.rb
 - lib/ule_page/page.rb
+- lib/ule_page/page_map.rb
 - lib/ule_page/site_prism_extender.rb
 - lib/ule_page/version.rb
 - ule_page.gemspec
@@ -267,7 +269,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="