upmin-admin 0.1.0 → 0.1.01

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d17a5316e3ae23cb3bfe9e66d531798356f02ad4
-  data.tar.gz: ad0e64565f7304bec6f762db4ea7549dd42cf87b
+  metadata.gz: 910d8396eb70b53feb5a498af6acc41edb1e3d1e
+  data.tar.gz: 6e2d7366490c0dfb137a503a02fd6784111714c4
 SHA512:
-  metadata.gz: 0605a9cd8ef301ec6ce36a51f0ce5d2349f084bab91b878b14f58fca4cf52975db25db4f38235a8aeed95e7b10ad8dd407c557b936a38bce2d5b34bdf1180b24
-  data.tar.gz: 6a9d6a9607628fad7263dd7513e5fd193725c4048b8e5d90dc53fb0fa728631eee4ced49c9ef2404b4439d6bfcadbb7ae42ffd43607a6fb073a09ba305d3bd42
+  metadata.gz: 4aea3404252228d686ed20f0a480e7d32898c70ef6edc895b387272bc14cfdb82bf6e06f8044fa15360fcf3ddc3dea147b6429c3cd6997460dff5d785e153e01
+  data.tar.gz: bdb283f1c155465a8f94be4b5d290d21ff0c2883c9536323850b809a5e3a0223df65c2d3212f44bb073c89bd587c3b192e1d49f9ded56fe327a6dbdafc815df8

data/README.md

@@ -1,6 +1,9 @@
 # Upmin Admin
 
-Upmin Admin is a framework for creating powerful admin backends with minimal effort.
+[![Gem Version](https://badge.fury.io/rb/upmin-admin.svg)](http://badge.fury.io/rb/upmin-admin)
+
+Upmin Admin is a framework for creating powerful Ruby on Rails admin backends with minimal effort.
+Upmin currently supports Rails 3.2, 4.0, 4.1 & 4.2.
 
 
 ## Demo Videos
@@ -59,7 +62,7 @@ For further documentation, please visit our [Wiki](https://github.com/upmin/upmi
 
 ## Going Forward
 
-Upmin Admin is new. It has been live for less than a few months, so there are going to be things missing. If you want to make it better, get involved and [create issues](https://github.com/upmin/upmin-admin-ruby/issues) when you find bugs or want new features, and contribute with pull requests.
+Upmin Admin is new. It has been live for less than a few months, so there are going to be things missing. If you want to make it better, get involved and [create issues](https://github.com/upmin/upmin-admin-ruby/issues) when you find bugs or want new features, and [contribute](https://github.com/upmin/upmin-admin-ruby/blob/master/CONTRIBUTING.md) with pull requests.
 
 The major features that are being worked on now are:
 

data/Rakefile

@@ -13,12 +13,17 @@ end
 
 task :default => "spec:all"
 
-def update_files
-    # Drop and reload spec files
+def update_files(gemfile = nil)
+  # Drop and reload spec files
   sh "rm -rf spec/"
   sh "cp -R ../../spec spec"
   sh "cp ../../.rspec .rspec"
 
+  # Copy gemfile specific specs if they exist
+  if Dir.exists?("../../spec_#{gemfile}")
+    sh "cp -R ../../spec_#{gemfile} spec/#{gemfile}"
+  end
+
   # Drop and reload Upmin::Model files
   sh "rm -rf app/upmin/"
   sh "cp -R ../../test_app_upmin app/upmin"
@@ -69,16 +74,47 @@ namespace :spec do
     end
   end
 
+  desc "Run Tests with namespaced models"
+  task :namespaced_model do
+    Dir.chdir("test_apps/namespaced_model")
+    puts "Testing in #{`pwd`}"
+    sh "bundle install --quiet"
+    sh "bundle update --quiet"
+
+    # Drop migrations and recreate
+    sh "rm -rf db/migrate/*.test_models.rb"
+    sh "bundle exec rake railties:install:migrations > /dev/null"
+
+    sh "RAILS_ENV=test bundle exec rake db:drop db:create db:migrate db:seed --quiet > /dev/null"
+
+    update_files("namespaced_model")
+
+    # Run tests
+    sh "bundle exec rake"
+  end
+
+
+  desc "Run Tests with namespaced models quickly (no bundle install etc)"
+  task :namespaced_model_quick do
+    Dir.chdir("test_apps/namespaced_model")
+    puts "Re-Testing in #{`pwd`}. Bundle install and migration updates will NOT happen!"
+
+    update_files("namespaced_model")
+
+    # Run tests
+    sh "bundle exec rake"
+  end
+
   desc "Run Tests against all ORMs"
   task :all do
-    %w(active_record_32 active_record_40 active_record_41 active_record_42 will_paginate data_mapper).each do |gemfile|
+    %w(active_record_32 active_record_40 active_record_41 active_record_42 will_paginate data_mapper namespaced_model).each do |gemfile|
       sh "rake spec:#{gemfile}"
     end
   end
 
   desc "Run Tests against all ORMs"
   task :all_quick do
-    %w(active_record_32 active_record_40 active_record_41 active_record_42 will_paginate data_mapper).each do |gemfile|
+    %w(active_record_32 active_record_40 active_record_41 active_record_42 will_paginate data_mapper namespaced_model).each do |gemfile|
       sh "rake spec:#{gemfile}_quick"
     end
   end

data/app/controllers/upmin/models_controller.rb

@@ -117,7 +117,7 @@ module Upmin
       end
 
       def set_query
-        @query = Upmin::Query.new(@klass, params[:q], page: @page, per_page: 30)
+        @query = Upmin::Query.new(@klass, params[:q], page: @page, per_page: @klass.items_per_page)
       end
 
       def set_model

data/app/views/kaminari/_first_page.html.haml

@@ -0,0 +1,3 @@
+- unless current_page.first?
+  %li.first
+    = link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, :remote => remote

data/app/views/kaminari/_gap.html.haml

@@ -0,0 +1,2 @@
+%li.page.gap.disabled
+  %a{:href => "#", :onclick => "return false;"}= raw(t 'views.pagination.truncate')

data/app/views/kaminari/_last_page.html.haml

@@ -0,0 +1,3 @@
+- unless current_page.last?
+  %li.last.next
+    = link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, {:remote => remote}

data/app/views/kaminari/_next_page.html.haml

@@ -0,0 +1,3 @@
+- unless current_page.last?
+  %li.next_page
+    = link_to_unless current_page.last?, raw(t 'views.pagination.next'), url, :rel => 'next', :remote => remote

data/app/views/kaminari/_page.html.haml

@@ -0,0 +1,2 @@
+%li{:class => "page#{' active' if page.current?}"}
+  = link_to page, url, opts = {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil}

data/app/views/kaminari/_paginator.html.haml

@@ -0,0 +1,11 @@
+= paginator.render do
+  %ul.pagination
+    = first_page_tag unless current_page.first?
+    = prev_page_tag unless current_page.first?
+    - each_page do |page|
+      - if page.left_outer? || page.right_outer? || page.inside_window?
+        = page_tag page
+      - elsif !page.was_truncated?
+        = gap_tag
+    = next_page_tag unless current_page.last?
+    = last_page_tag unless current_page.last?

data/app/views/kaminari/_prev_page.html.haml

@@ -0,0 +1,3 @@
+- unless current_page.first?
+  %li.prev
+    = link_to_unless current_page.first?, raw(t 'views.pagination.previous'), url, :rel => 'prev', :remote => remote

data/lib/upmin/configuration.rb

@@ -45,6 +45,19 @@ module Upmin
       end
     end
 
+    def items_per_page=(items)
+      @custom_items_per_page = true
+      @items_per_page = items
+    end
+
+    def items_per_page
+      if defined?(@custom_items_per_page)
+        return @items_per_page
+      else
+        return 30
+      end
+    end
+
     private
 
       def default_models

data/lib/upmin/engine.rb

@@ -1,4 +1,6 @@
 # require 'haml-rails'
+# require kaminari here to affect load order so that custom kaminari views load from upmin
+require 'kaminari'
 
 module Upmin
   class Engine < ::Rails::Engine

data/lib/upmin/model.rb

@@ -96,8 +96,6 @@ module Upmin
     end
 
 
-
-
     ###########################################################
     ###  Class methods
     ###########################################################
@@ -112,10 +110,23 @@ module Upmin
 
     def Model.find_or_create_class(model_name)
       ::Rails.application.eager_load!
-      return "Admin#{model_name}".constantize
+
+      create_name = model_name.gsub(":", "")
+      return "Admin#{create_name}".constantize
     rescue NameError
-      eval("class ::Admin#{model_name} < Upmin::Model; end")
-      return "Admin#{model_name}".constantize
+      if model_name.match(/::/)
+        class_str = <<-class_string
+          class ::Admin#{create_name} < Upmin::Model
+            def self.model_class
+              return #{model_name}
+            end
+          end
+        class_string
+        eval(class_str)
+      else
+        eval("class ::Admin#{create_name} < Upmin::Model; end")
+      end
+      return "Admin#{create_name}".constantize
     end
 
     # Returns all upmin models.
@@ -127,10 +138,6 @@ module Upmin
       return all
     end
 
-    def Model.model_class
-      @model_class ||= inferred_model_class
-    end
-
     def Model.model_class?
       return model_class
     rescue Upmin::UninferrableSourceError
@@ -142,24 +149,28 @@ module Upmin
     end
 
     def Model.inferred_model_class
-      name = model_class_name
+      name = inferred_model_class_name
       return name.constantize
     rescue NameError => error
       raise if name && !error.missing_name?(name)
       raise Upmin::UninferrableSourceError.new(self)
     end
 
-    def Model.model_class_name
+    def Model.inferred_model_class_name
       raise NameError if name.nil? || name.demodulize !~ /Admin.+$/
       return name.demodulize[5..-1]
     end
 
+    def Model.model_class_name
+      return model_class.name
+    end
+
     def Model.model_name
       return ActiveModel::Name.new(model_class)
     end
 
     def Model.humanized_name(type = :plural)
-      names = model_class_name.split(/(?=[A-Z])/)
+      names = model_class_name.split(/(?=[A-Z])/).map{|n| n.gsub(":", "")}
       if type == :plural
         names[names.length-1] = names.last.pluralize
       end
@@ -202,10 +213,9 @@ module Upmin
       return @color_index
     end
 
-
     def Model.active_record?
       if defined?(ActiveRecord)
-        return model_class.superclass == ::ActiveRecord::Base
+        return (model_class < ::ActiveRecord::Base) == true
       else
         return false
       end
@@ -220,7 +230,6 @@ module Upmin
     end
 
 
-
     ###########################################################
     ### Customization methods for Admin<Model> classes
     ###########################################################
@@ -273,6 +282,9 @@ module Upmin
       return @actions
     end
 
+    def Model.items_per_page(items = Upmin.configuration.items_per_page)
+      return @items_per_page ||= items
+    end
 
 
     ###########################################################

data/lib/upmin/railties/paginator.rb

@@ -4,6 +4,7 @@ module Upmin::Railties
 
     def up_paginate(scope, options = {}, &block)
       if defined?(WillPaginate)
+        options[:renderer] = BootstrapPagination::Rails if defined?(BootstrapPagination::Rails)
         return will_paginate(scope, options)
       else # Use Kaminari
         return paginate(scope, options, &block)

data/lib/upmin/railties/render_helpers.rb

@@ -180,9 +180,12 @@ module Upmin::Railties
     def RenderHelpers.search_box_partials(klass, options = {})
       partials = []
       # <options[:as]>
+      # <model_name>_search_box, eg: order_search_box
       # ransack_search_box
+      model_name = klass.underscore_name
 
       partials << build_search_box_path(options[:as]) if options[:as]
+      partials << build_search_box_path("#{model_name}_search_box")
       partials << build_search_box_path(:ransack_search_box)
       return partials
     end

data/lib/upmin/version.rb

@@ -1,3 +1,3 @@
 module Upmin
-  VERSION = "0.1.0"
+  VERSION = "0.1.01"
 end

data/spec/features/search_spec.rb

@@ -15,7 +15,7 @@ feature("Search Views") do
 
     # Make sure some basic pagination exits
     within(".pagination:first-of-type") do
-      within(".current") do
+      within(".active, .current") do
         expect(page).to(have_content("1"))
       end
 
@@ -24,7 +24,7 @@ feature("Search Views") do
     end
 
     within(".pagination:nth-of-type(2)") do
-      within(".current") do
+      within(".active, .current") do
         expect(page).to(have_content("2"))
       end
 
@@ -35,14 +35,14 @@ feature("Search Views") do
     end
 
     within(".pagination:last-of-type") do
-      within(".current") do
+      within(".active, .current") do
         expect(page).to(have_content("3"))
       end
     end
   end
 
   scenario("Search via integer") do
-    visit("/upmin/m/Order")
+    visit("/upmin/m/User")
 
     expect(page).to(have_selector("a.search-result-link", count: 30))
 
@@ -77,4 +77,28 @@ feature("Search Views") do
     expect(page).to(have_content(expected_user.name))
   end
 
+  scenario("config.items_per_page") do
+    Upmin.configuration.items_per_page = 25
+
+    visit("/upmin/m/Order")
+
+    # Global config of 25 should override default of 30
+    expect(page).to(have_selector("a.search-result-link", count: 25))
+
+    # Reset this.
+    Upmin.configuration = Upmin::Configuration.new
+  end
+
+  scenario("Model items_per_page with config.items_per_page") do
+    Upmin.configuration.items_per_page = 25
+
+    visit("/upmin/m/Shipment")
+
+    # `items_per_page 20` in the model should override global config of 25
+    expect(page).to(have_selector("a.search-result-link", count: 20))
+
+    # Reset this.
+    Upmin.configuration = Upmin::Configuration.new
+  end
+
 end

data/spec/lib/configuration_spec.rb

@@ -57,4 +57,17 @@ describe Upmin::Configuration do
 
   end
 
+  describe "#items_per_page" do
+
+    context "default items_per_page" do
+      it { expect(@config.items_per_page).to(eq(30)) }
+    end
+
+    context "custom items_per_page" do
+      before(:each) { @config.items_per_page = 10 }
+      it { expect(@config.items_per_page).to(eq(10)) }
+    end
+
+  end
+
 end

data/spec/spec_helper.rb

@@ -46,11 +46,11 @@ RSpec.configure do |config|
   end
 
   # Uncomment this if you want to the page to be saved and opened after any test failure.
-  config.after do |example|
-    if example.metadata[:type] == :feature && example.exception.present?
-      save_and_open_page
-    end
-  end
+  # config.after do |example|
+  #   if example.metadata[:type] == :feature && example.exception.present?
+  #     save_and_open_page
+  #   end
+  # end
 
   config.include(FactoryGirl::Syntax::Methods)
   config.include(ActionView::Helpers::NumberHelper, type: :view)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: upmin-admin
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.01
 platform: ruby
 authors:
 - Jon Calhoun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-28 00:00:00.000000000 Z
+date: 2014-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -174,8 +174,6 @@ extra_rdoc_files: []
 files:
 - README.md
 - Rakefile
-- app/assets/images/upmin/logo_large.png
-- app/assets/images/upmin/logo_small.png
 - app/assets/javascripts/upmin/application.js
 - app/assets/javascripts/upmin/attributes/datetime.js
 - app/assets/javascripts/upmin/helpers.js
@@ -196,6 +194,13 @@ files:
 - app/controllers/upmin/models_controller.rb
 - app/helpers/upmin/application_helper.rb
 - app/helpers/upmin/models_helper.rb
+- app/views/kaminari/_first_page.html.haml
+- app/views/kaminari/_gap.html.haml
+- app/views/kaminari/_last_page.html.haml
+- app/views/kaminari/_next_page.html.haml
+- app/views/kaminari/_page.html.haml
+- app/views/kaminari/_paginator.html.haml
+- app/views/kaminari/_prev_page.html.haml
 - app/views/layouts/upmin/_navbar.html.haml
 - app/views/layouts/upmin/application.html.haml
 - app/views/upmin/models/dashboard.html.haml
@@ -221,7 +226,6 @@ files:
 - app/views/upmin/partials/search_boxes/_ransack_search_box.html.haml
 - app/views/upmin/partials/search_results/_results.html.haml
 - config/routes.rb
-- lib/tasks/accordive_rails_tasks.rake
 - lib/tasks/upmin_tasks.rake
 - lib/upmin.rb
 - lib/upmin/action.rb

data/lib/tasks/accordive_rails_tasks.rake

@@ -1,4 +0,0 @@
-# desc "Explaining what the task does"
-# task :accordive_rails do
-#   # Task goes here
-# end