upmin-admin 0.0.38 → 0.0.39

data/config/routes.rb

@@ -5,11 +5,14 @@ Upmin::Engine.routes.draw do
   # TODO(jon): Move dashboards to an appropriate controller
   get "/", as: :upmin_dashboard, controller: :models, action: :dashboard
 
-  scope :m do
+  scope "m" do
     scope "/:klass" do
       match "/", as: :upmin_search, controller: :models, action: :search, via: [:get, :post]
 
-      scope "/:id" do
+      get "/new", as: :upmin_new_model, controller: :models, action: :new
+      post "/new", as: :upmin_create_model, controller: :models, action: :create
+
+      scope "/i/:id" do
         get "/", as: :upmin_model, controller: :models, action: :show
         put "/", controller: :models, action: :update
 

data/lib/upmin/admin.rb

@@ -22,6 +22,8 @@ require "sass-rails"
 # If WillPaginate is present we just use it, but by default upmin-admin uses Kaminari
 require "kaminari" unless defined?(WillPaginate)
 
+require 'rails'
+
 module Upmin
   module Admin
   end

data/lib/upmin/klass.rb

@@ -12,6 +12,11 @@ module Upmin
       end
     end
 
+    def new(*args)
+      m = model.new(*args)
+      return Upmin::Model.new(m)
+    end
+
     # Exposing a model method, but wrapping the result in
     # an Upmin::Model
     def find(*args)

data/lib/upmin/model.rb

@@ -25,6 +25,10 @@ module Upmin
       }
     end
 
+    def new_record?
+      return instance.new_record?
+    end
+
     ## Methods for getting attributes, associations, etc and anything relevant to them.
 
 

data/lib/upmin/paginator.rb

@@ -4,7 +4,7 @@ module Upmin
     def Paginator.paginate(chain, page = 1, per_page = 30)
       if defined?(WillPaginate)
         # Ignore per page for now - just use the will_paginate default
-        return chain.page(page.to_i)
+        return chain.paginate(page: page.to_i, per_page: per_page)
       else # Use Kaminari
         return chain.page(page).per(per_page)
       end

data/lib/upmin/railties/active_record.rb

@@ -12,11 +12,9 @@ module Upmin::Railties
       # Add a single attribute to upmin attributes. If this is called
       # before upmin_attributes the attributes will not include any defaults
       # attributes.
-      def upmin_attribute(attribute)
-        upmin_attributes unless defined?(@upmin_attributes)
-
-        attribute = attribute.to_sym
-        @upmin_attributes << attribute unless @upmin_attributes.include?(attribute)
+      def upmin_attribute(attribute = nil)
+        @upmin_extra_attrs = [] unless defined?(@upmin_extra_attrs)
+        @upmin_extra_attrs << attribute.to_sym if attribute
       end
 
       # Sets the upmin_attributes to the provided attributes if any are
@@ -25,11 +23,14 @@ module Upmin::Railties
       # then the upmin_attributes are set to the default attributes.
       # Returns the upmin_attributes
       def upmin_attributes(*attributes)
+        @upmin_extra_attrs = [] unless defined?(@upmin_extra_attrs)
+
         if attributes.any?
           @upmin_attributes = attributes.map{|a| a.to_sym}
         end
+
         @upmin_attributes ||= attribute_names.map{|a| a.to_sym}
-        return @upmin_attributes
+        return (@upmin_attributes + @upmin_extra_attrs).uniq
       end
 
 
@@ -40,7 +41,7 @@ module Upmin::Railties
         @upmin_actions ||= []
 
         action = action.to_sym
-        @upmin_actions << action unless @upmin_actions.include?(attribute)
+        @upmin_actions << action unless @upmin_actions.include?(action)
       end
 
       # Sets the upmin_actions to the provided actions if any are

data/lib/upmin/railties/render_helpers.rb

@@ -4,13 +4,15 @@ module Upmin::Railties
 
     def RenderHelpers.model_partials(upmin_model, options)
       partials = []
+      # Add "new_" in front of any partial for the partial for new view.
       # <options[:as]>
       # <model_name>
       # model
+      prefix = upmin_model.new_record? ? "new_" : ""
 
       partials << build_model_path(options[:as]) if options[:as]
-      partials << build_model_path(upmin_model.klass.name.underscore)
-      partials << build_model_path(:model)
+      partials << build_model_path(upmin_model.klass.name.underscore, prefix)
+      partials << build_model_path(:model, prefix)
       return partials
     end
 
@@ -111,8 +113,8 @@ module Upmin::Railties
     end
 
 
-    def RenderHelpers.build_model_path(partial_name)
-      return "#{root_path}/models/#{partial_name}"
+    def RenderHelpers.build_model_path(partial_name, prefix = "")
+      return "#{root_path}/models/#{prefix}#{partial_name}"
     end
 
     def RenderHelpers.build_attribute_path(partial_name)

data/lib/upmin/version.rb

@@ -1,3 +1,3 @@
 module Upmin
-  VERSION = "0.0.38"
+  VERSION = "0.0.39"
 end

data/spec/factories/factories.rb

@@ -0,0 +1,16 @@
+
+FactoryGirl.define do
+  factory(:user) do
+    name "Jon Calhoun"
+    email "joncalhoun@gmail.com"
+    stripe_card_id "sc_123ab1123"
+  end
+
+  factory(:product) do
+    name "Office Home & Student 2013 - Windows"
+    short_desc "Create, communicate and learn using streamlined touch, pen or keyboard commands"
+    price "139.99"
+    manufacturer "Microsoft"
+    free_shipping true
+  end
+end

data/spec/features/action_spec.rb

@@ -0,0 +1,68 @@
+# encoding: UTF-8
+require "spec_helper"
+
+feature("Performing an action") do
+  background do
+    # Setup BG Stuff
+  end
+
+  scenario("with a valid user") do
+    visit("/upmin/m/User/new")
+
+    expected_user = build(:user)
+
+    fill_in("user_name", with: expected_user.name)
+    fill_in("user_email", with: expected_user.email)
+    fill_in("user_stripe_card_id", with: expected_user.stripe_card_id)
+
+    expect { click_button("Create") }.to(change(User, :count).by(1))
+
+    expect(page).to(have_selector("input#user_name[value='#{expected_user.name}']"))
+    expect(page).to(have_selector("input#user_email[value='#{expected_user.email}']"))
+    expect(page).to(have_selector("input#user_stripe_card_id[value='#{expected_user.stripe_card_id}']"))
+  end
+
+  scenario("with an invalid user") do
+    visit("/upmin/m/User/new")
+
+    invalid_user = build(:user, email: "invalid")
+
+    fill_in("user_name", with: invalid_user.name)
+    fill_in("user_email", with: invalid_user.email)
+    fill_in("user_stripe_card_id", with: invalid_user.stripe_card_id)
+
+    expect { click_button("Create") }.not_to(change(User, :count))
+
+    within(".alert.alert-danger") do
+      expect(page).to(have_content("User was NOT created."))
+    end
+
+    within(".field_with_errors") do
+      expect(page).to(have_selector("input#user_email"))
+    end
+
+    # Make sure the inputs have the values typed in.
+    expect(page).to(have_selector("input#user_name[value='#{invalid_user.name}']"))
+    expect(page).to(have_selector("input#user_email[value='#{invalid_user.email}']"))
+    expect(page).to(have_selector("input#user_stripe_card_id[value='#{invalid_user.stripe_card_id}']"))
+  end
+
+  scenario("with a nil attribute") do
+    product = build(:product)
+    visit("/upmin/m/Product/new")
+
+    check("product_name_is_nil")
+    fill_in("product_short_desc", with: product.short_desc)
+    fill_in("product_manufacturer", with: product.manufacturer)
+
+    expect { click_button("Create") }.to(change(Product, :count).by(1))
+
+    box = find("#product_name_is_nil")
+    expect(box).to(be_checked)
+
+    created = Product.last
+    expect(created.name).to(be_nil)
+    expect(created.short_desc).to(eq(product.short_desc))
+    expect(created.manufacturer).to(eq(product.manufacturer))
+  end
+end

data/spec/features/edit_model_spec.rb

@@ -0,0 +1,74 @@
+# encoding: UTF-8
+require "spec_helper"
+
+feature("Update an existing model") do
+  background do
+    # Setup BG Stuff
+  end
+
+  scenario("with valid order info") do
+    user = User.first
+    updated_user = build(:user)
+
+    visit("/upmin/m/User/i/#{user.id}")
+
+    fill_in("user_name", with: updated_user.name)
+    fill_in("user_email", with: updated_user.email)
+    fill_in("user_stripe_card_id", with: updated_user.stripe_card_id)
+
+    click_button("Save")
+
+    expect(page).to(have_selector("input#user_name[value='#{updated_user.name}']"))
+    expect(page).to(have_selector("input#user_email[value='#{updated_user.email}']"))
+    expect(page).to(have_selector("input#user_stripe_card_id[value='#{updated_user.stripe_card_id}']"))
+
+    user.reload
+    expect(user.name).to(eq(updated_user.name))
+    expect(user.email).to(eq(updated_user.email))
+    expect(user.stripe_card_id).to(eq(updated_user.stripe_card_id))
+  end
+
+  scenario("with invalid order info") do
+    user = User.first
+    invalid_user = build(:user, email: "invalid")
+
+    visit("/upmin/m/User/i/#{user.id}")
+
+    fill_in("user_name", with: invalid_user.name)
+    fill_in("user_email", with: invalid_user.email)
+    fill_in("user_stripe_card_id", with: invalid_user.stripe_card_id)
+
+    click_button("Save")
+
+    within(".alert.alert-danger") do
+      expect(page).to(have_content("User was NOT updated."))
+    end
+
+    within(".field_with_errors") do
+      expect(page).to(have_selector("input#user_email"))
+    end
+
+    expect(page).to(have_selector("input#user_name[value='#{invalid_user.name}']"))
+    expect(page).to(have_selector("input#user_email[value='#{invalid_user.email}']"))
+    expect(page).to(have_selector("input#user_stripe_card_id[value='#{invalid_user.stripe_card_id}']"))
+
+    user.reload
+    expect(user.name).not_to(eq(invalid_user.name))
+    expect(user.email).not_to(eq(invalid_user.email))
+    expect(user.stripe_card_id).not_to(eq(invalid_user.stripe_card_id))
+  end
+
+  scenario("with a nil attribute") do
+    product = Product.first
+    visit("/upmin/m/Product/i/#{product.id}")
+
+    check("product_name_is_nil")
+    click_button("Save")
+
+    box = find("#product_name_is_nil")
+    expect(box).to(be_checked)
+
+    product.reload
+    expect(product.name).to(be_nil)
+  end
+end

data/spec/features/new_model_spec.rb

@@ -0,0 +1,68 @@
+# encoding: UTF-8
+require "spec_helper"
+
+feature("Create a new model") do
+  background do
+    # Setup BG Stuff
+  end
+
+  scenario("with a valid user") do
+    visit("/upmin/m/User/new")
+
+    expected_user = build(:user)
+
+    fill_in("user_name", with: expected_user.name)
+    fill_in("user_email", with: expected_user.email)
+    fill_in("user_stripe_card_id", with: expected_user.stripe_card_id)
+
+    expect { click_button("Create") }.to(change(User, :count).by(1))
+
+    expect(page).to(have_selector("input#user_name[value='#{expected_user.name}']"))
+    expect(page).to(have_selector("input#user_email[value='#{expected_user.email}']"))
+    expect(page).to(have_selector("input#user_stripe_card_id[value='#{expected_user.stripe_card_id}']"))
+  end
+
+  scenario("with an invalid user") do
+    visit("/upmin/m/User/new")
+
+    invalid_user = build(:user, email: "invalid")
+
+    fill_in("user_name", with: invalid_user.name)
+    fill_in("user_email", with: invalid_user.email)
+    fill_in("user_stripe_card_id", with: invalid_user.stripe_card_id)
+
+    expect { click_button("Create") }.not_to(change(User, :count))
+
+    within(".alert.alert-danger") do
+      expect(page).to(have_content("User was NOT created."))
+    end
+
+    within(".field_with_errors") do
+      expect(page).to(have_selector("input#user_email"))
+    end
+
+    # Make sure the inputs have the values typed in.
+    expect(page).to(have_selector("input#user_name[value='#{invalid_user.name}']"))
+    expect(page).to(have_selector("input#user_email[value='#{invalid_user.email}']"))
+    expect(page).to(have_selector("input#user_stripe_card_id[value='#{invalid_user.stripe_card_id}']"))
+  end
+
+  scenario("with a nil attribute") do
+    product = build(:product)
+    visit("/upmin/m/Product/new")
+
+    check("product_name_is_nil")
+    fill_in("product_short_desc", with: product.short_desc)
+    fill_in("product_manufacturer", with: product.manufacturer)
+
+    expect { click_button("Create") }.to(change(Product, :count).by(1))
+
+    box = find("#product_name_is_nil")
+    expect(box).to(be_checked)
+
+    created = Product.last
+    expect(created.name).to(be_nil)
+    expect(created.short_desc).to(eq(product.short_desc))
+    expect(created.manufacturer).to(eq(product.manufacturer))
+  end
+end

data/spec/features/search_spec.rb

@@ -0,0 +1,77 @@
+# encoding: UTF-8
+require "spec_helper"
+
+feature("Search Views") do
+  background do
+    # Setup BG Stuff
+  end
+
+  scenario("Pagination") do
+    visit("/upmin/m/User")
+
+    # Make sure some basic pagination exits
+    within(".pagination") do
+      within(".current") do
+        expect(page).to(have_content("1"))
+      end
+
+      expect(page).to(have_content("Next"))
+      click_link("Next")
+    end
+
+    within(".pagination") do
+      within(".current") do
+        expect(page).to(have_content("2"))
+      end
+
+      expect(page).to(have_content("Next"))
+      expect(page).to(have_content("Prev"))
+
+      click_link("3")
+    end
+
+    within(".pagination") do
+      within(".current") do
+        expect(page).to(have_content("3"))
+      end
+    end
+  end
+
+  scenario("Search via integer") do
+    visit("/upmin/m/Order")
+
+    expect(page).to(have_selector("a.search-result-link", count: 30))
+
+    fill_in("q_id_gteq", with: 1)
+    fill_in("q_id_lteq", with: 5)
+    click_button("Search")
+
+    expect(page).to(have_selector("a.search-result-link", count: 5))
+  end
+
+  scenario("Search via string") do
+    expected_user = User.first
+
+    visit("/upmin/m/User")
+
+    fill_in("q_name_cont", with: expected_user.name)
+    click_button("Search")
+
+    expect(page).to(have_selector("a.search-result-link", minimum: 1))
+    expect(page).to(have_content(expected_user.name))
+  end
+
+  scenario("Search via string") do
+    expected_user = User.first
+
+    visit("/upmin/m/User")
+
+    fill_in("q_name_cont", with: expected_user.name)
+    click_button("Search")
+
+    expect(page).to(have_selector("a.search-result-link", minimum: 1))
+    expect(page).to(have_content(expected_user.name))
+  end
+
+
+end

data/spec/spec_helper.rb

@@ -0,0 +1,51 @@
+ENV["RAILS_ENV"] ||= 'test'
+require 'spec_helper'
+require File.expand_path("../../config/environment", __FILE__)
+require 'rspec/rails'
+require 'capybara/rspec'
+require 'capybara/rails'
+require 'database_cleaner'
+require 'factory_girl_rails'
+
+
+if defined?(ActiveRecord)
+  require File.expand_path('../../../../seed/seeder', __FILE__)
+end
+
+
+RSpec.configure do |config|
+  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+  config.use_transactional_fixtures = true
+  config.infer_spec_type_from_file_location!
+  config.order = "random"
+
+  config.expect_with(:rspec) do |expectations|
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  config.mock_with(:rspec) do |mocks|
+    mocks.verify_partial_doubles = true
+  end
+
+  config.before(:suite) do
+    Seeder.seed
+  end
+
+  config.after(:suite) do
+  end
+
+  config.before(:each) do
+  end
+
+  config.after(:each) do
+  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.include(FactoryGirl::Syntax::Methods)
+end