upmin-admin 0.1.01 → 0.1.3

data/lib/upmin/railties/render_helpers.rb

@@ -42,6 +42,7 @@ module Upmin::Railties
       partials << build_attribute_path(options[:as]) if options[:as]
       partials << build_attribute_path("#{model_name}_#{attribute.name}")
       partials << build_attribute_path("#{model_name}_#{attr_type}")
+      partials << build_attribute_path(attribute.name)
       partials << build_attribute_path(attr_type)
       partials << build_attribute_path(:unknown)
       return partials
@@ -74,6 +75,7 @@ module Upmin::Railties
       partials << build_association_path(options[:as]) if options[:as]
       partials << build_association_path("#{model_name}_#{association.name}")
       partials << build_association_path("#{model_name}_#{assoc_type}")
+      partials << build_association_path(association.name)
       partials << build_association_path(assoc_type)
       partials << build_association_path(:associations)
       return partials

data/lib/upmin/version.rb

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

data/spec/features/delete_model_spec.rb

@@ -0,0 +1,38 @@
+# encoding: UTF-8
+require "spec_helper"
+
+feature("Delete an existing model") do
+  background do
+    # Setup BG Stuff
+  end
+
+  scenario("should see delete button with confirmation") do
+    user = User.first
+    updated_user = build(:user)
+
+    visit("/upmin/m/User/i/#{user.id}")
+
+    expect(page).to(have_selector("a[data-method='delete']"))
+    expect(page).to(have_selector("a[data-confirm='Are you sure?']"))
+
+  end
+
+  scenario("should delete if confirmed") do
+    user = User.first
+    # updated_user = build(:user)
+
+    visit("/upmin/m/User/i/#{user.id}")
+
+    first('a.delete').click
+
+    #expect(page.driver.alert_messages.last).to eq 'Are you sure?'
+
+    if defined?(DataMapper)
+      expect(User.get(user.id)).to be_nil
+    else
+      expect(User.where(id: user.id)).not_to exist
+    end
+
+  end
+
+end

data/spec/features/edit_model_spec.rb

@@ -41,7 +41,7 @@ feature("Update an existing model") do
     click_button("Save")
 
     within(".alert.alert-danger") do
-      expect(page).to(have_content("User was NOT updated."))
+      expect(page).to(have_content("Customer was NOT updated."))
       expect(page).to(have_selector("li", text: /email/i))
     end
 

data/spec/features/enum_attributes_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+feature 'Enum Attributes' do
+
+  if ActiveRecord::Base.respond_to? :enum
+    scenario 'Creating a new model' do
+      visit '/upmin/m/UserWithRoleEnum/new'
+      choose 'Admin'
+      expect { click_button("Create") }.to(change(UserWithRoleEnum, :count))
+      expect(page).to(have_selector("input#user_with_role_enum_role_admin[checked='checked']"))
+    end
+
+    scenario 'Updating a model' do
+      user = UserWithRoleEnum.create!
+      visit "/upmin/m/UserWithRoleEnum/i/#{user.id}"
+      choose 'Admin'
+      click_button("Save")
+      expect(page).to(have_selector("input#user_with_role_enum_role_admin[checked='checked']"))
+      user.reload
+      expect(user.role).to eq 'admin'
+    end
+  end
+
+end

data/spec/features/navbar_spec.rb

@@ -10,13 +10,13 @@ feature("Navbar") do
     visit ("/upmin")
 
     within(".navbar ul.nav") do
-      expect(page).to(have_selector("li", text: "Users"))
+      expect(page).to(have_selector("li", text: "Customers"))
       expect(page).to(have_selector("li", text: "Products"))
       expect(page).to(have_selector("li", text: "Orders"))
       expect(page).to(have_selector("li", text: "Product Orders"))
       expect(page).to(have_selector("li", text: "Shipments"))
 
-      click_link("Users")
+      click_link("Customers")
     end
 
     expect(page).to(have_selector(".upmin-model", minimum: 10))
@@ -30,13 +30,13 @@ feature("Navbar") do
     visit ("/upmin")
 
     within(".navbar ul.nav") do
-      expect(page).to(have_selector("li", text: "Users"))
+      expect(page).to(have_selector("li", text: "Customers"))
       expect(page).to(have_selector("li", text: "Products"))
       expect(page).not_to(have_selector("li", text: "Orders"))
       expect(page).not_to(have_selector("li", text: "Product Orders"))
       expect(page).not_to(have_selector("li", text: "Shipments"))
 
-      click_link("Users")
+      click_link("Customers")
     end
 
     expect(page).to(have_selector(".upmin-model", minimum: 10))

data/spec/features/new_model_spec.rb

@@ -34,7 +34,7 @@ feature("Create a new model") do
     expect { click_button("Create") }.not_to(change(User, :count))
 
     within(".alert.alert-danger") do
-      expect(page).to(have_content("User was NOT created."))
+      expect(page).to(have_content("Customer was NOT created."))
     end
 
     within(".field_with_errors") do

data/spec/features/search_spec.rb

@@ -10,10 +10,24 @@ feature("Search Views") do
     # it("TODO(jon): Write this test")
   end
 
+  scenario("Page Entries Info") do
+    visit("/upmin/m/User")
+
+    # Make sure some basic page entries info exists
+    within(".page-entries-info") do
+      within("b:first-of-type") do
+        expect(page).to(have_content("1 - 30"))
+      end
+
+      expect(page).to(have_content("of"))
+      expect(page).to(have_content("in total"))
+    end
+  end
+
   scenario("Pagination") do
     visit("/upmin/m/User")
 
-    # Make sure some basic pagination exits
+    # Make sure some basic pagination exists
     within(".pagination:first-of-type") do
       within(".active, .current") do
         expect(page).to(have_content("1"))
@@ -46,35 +60,11 @@ feature("Search Views") do
 
     expect(page).to(have_selector("a.search-result-link", count: 30))
 
-    fill_in("q_id_gteq", with: 1)
+    fill_in("q_id_gteq", with: 2)
     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))
+    expect(page).to(have_selector("a.search-result-link", count: 4))
   end
 
   scenario("config.items_per_page") do

data/spec/lib/attribute_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe Upmin::Attribute do
+
+  if ActiveRecord::Base.respond_to? :enum
+    describe '#enum_options' do
+      it 'returns options for an enum attribute' do
+        model = Upmin::Model.find_class(UserWithRoleEnum).new
+        attribute = Upmin::Attribute.new(model, :role)
+        expect(attribute.enum_options).to eq ['default', 'admin']
+      end
+    end
+  end
+
+end

data/spec/lib/upmin/active_record/model_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe Upmin::ActiveRecord::Model do
+
+  if ActiveRecord::Base.respond_to? :enum
+    describe ".attribute_type" do
+      it "correctly identifies an enum attribute" do
+        model = Upmin::Model.find_class(UserWithRoleEnum).new
+        attribute = Upmin::Attribute.new(model, :role)
+        expect(attribute.type).to eq(:enum)
+      end
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -27,6 +27,11 @@ RSpec.configure do |config|
   end
 
   config.before(:suite) do
+    if ActiveRecord::Base.respond_to? :enum
+      class UserWithRoleEnum < ActiveRecord::Base; enum role: [:default, :admin] end
+      ActiveRecord::Migration.create_table(:user_with_role_enums) {|t| t.integer :role, default: 0 }
+    end
+
     if defined?(DataMapper)
       # NOTE: eager_loading needs to be on in the app for testing.
       DataMapper.finalize
@@ -37,6 +42,9 @@ RSpec.configure do |config|
   end
 
   config.after(:suite) do
+    if ActiveRecord::Base.respond_to? :enum
+      ActiveRecord::Migration.drop_table :user_with_role_enums
+    end
   end
 
   config.before(:each) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: upmin-admin
 version: !ruby/object:Gem::Version
-  version: 0.1.01
+  version: 0.1.3
 platform: ruby
 authors:
 - Jon Calhoun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-13 00:00:00.000000000 Z
+date: 2015-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -95,6 +95,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: chartkick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -186,11 +214,13 @@ files:
 - app/assets/stylesheets/upmin/base.css.scss
 - app/assets/stylesheets/upmin/button_mixins.scss
 - app/assets/stylesheets/upmin/colors.scss
+- app/assets/stylesheets/upmin/dashboard.css
 - app/assets/stylesheets/upmin/instances.css.scss
 - app/assets/stylesheets/upmin/jquery-clockpicker.css
 - app/assets/stylesheets/upmin/models.css.scss
 - app/assets/stylesheets/upmin/pikaday.css
 - app/controllers/upmin/application_controller.rb
+- app/controllers/upmin/dashboard_controller.rb
 - app/controllers/upmin/models_controller.rb
 - app/helpers/upmin/application_helper.rb
 - app/helpers/upmin/models_helper.rb
@@ -203,17 +233,21 @@ files:
 - 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
+- app/views/upmin/dashboard/_chart.html.haml
+- app/views/upmin/dashboard/index.html.haml
 - app/views/upmin/models/new.html.haml
 - app/views/upmin/models/search.html.haml
 - app/views/upmin/models/show.html.haml
 - app/views/upmin/partials/actions/_action.html.haml
 - app/views/upmin/partials/associations/_associations.html.haml
 - app/views/upmin/partials/attributes/_boolean.html.haml
+- app/views/upmin/partials/attributes/_date.html.haml
 - app/views/upmin/partials/attributes/_datetime.html.haml
 - app/views/upmin/partials/attributes/_decimal.html.haml
+- app/views/upmin/partials/attributes/_enum.html.haml
 - app/views/upmin/partials/attributes/_float.html.haml
 - app/views/upmin/partials/attributes/_integer.html.haml
+- app/views/upmin/partials/attributes/_money_cents.html.haml
 - app/views/upmin/partials/attributes/_progress_bar.html.haml
 - app/views/upmin/partials/attributes/_string.html.haml
 - app/views/upmin/partials/attributes/_text.html.haml
@@ -226,6 +260,8 @@ 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/generators/upmin/install_generator.rb
+- lib/generators/upmin/templates/initializer.rb
 - lib/tasks/upmin_tasks.rake
 - lib/upmin.rb
 - lib/upmin/action.rb
@@ -248,6 +284,7 @@ files:
 - lib/upmin/query.rb
 - lib/upmin/railtie.rb
 - lib/upmin/railties/active_record.rb
+- lib/upmin/railties/dashboard.rb
 - lib/upmin/railties/data_mapper.rb
 - lib/upmin/railties/paginator.rb
 - lib/upmin/railties/render.rb
@@ -255,11 +292,15 @@ files:
 - lib/upmin/version.rb
 - spec/factories/factories.rb
 - spec/features/action_spec.rb
+- spec/features/delete_model_spec.rb
 - spec/features/edit_model_spec.rb
+- spec/features/enum_attributes_spec.rb
 - spec/features/navbar_spec.rb
 - spec/features/new_model_spec.rb
 - spec/features/search_spec.rb
+- spec/lib/attribute_spec.rb
 - spec/lib/configuration_spec.rb
+- spec/lib/upmin/active_record/model_spec.rb
 - spec/spec_helper.rb
 homepage: https://www.upmin.com/admin-rails
 licenses:
@@ -281,16 +322,20 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Quick and Easy Admin Dashboards
 test_files:
 - spec/factories/factories.rb
 - spec/features/action_spec.rb
+- spec/features/delete_model_spec.rb
 - spec/features/edit_model_spec.rb
+- spec/features/enum_attributes_spec.rb
 - spec/features/navbar_spec.rb
 - spec/features/new_model_spec.rb
 - spec/features/search_spec.rb
+- spec/lib/attribute_spec.rb
 - spec/lib/configuration_spec.rb
+- spec/lib/upmin/active_record/model_spec.rb
 - spec/spec_helper.rb

data/app/views/upmin/models/dashboard.html.haml

@@ -1,9 +0,0 @@
-.container
-  .row
-    .col-sm-12
-      %h1
-        Uh oh! The Dashboard isn't implemented yet.
-        %small
-          This is embarrassing. :(
-      %h3
-        ^ Click one of those links up top to use features that are working. ^