artfully_ose 1.2.0.beta.1 → 1.2.0.pre

data/app/views/venues/edit.html.haml

@@ -39,9 +39,7 @@
           = form.text_field :zip
           
       .control-group
-        =form.label :time_zone, :class => 'control-label' do
-          "Time Zone"
-          .tip.muted Changing your time zone will change your existing show times.
+        =form.label :time_zone, "Time Zone", :class => 'control-label'
         .controls
           = form.time_zone_select :time_zone, ActiveSupport::TimeZone.us_zones, {:default => current_user.current_organization.time_zone}, {:class => 'input-xlarge'}
           

data/config/initializers/devise.rb

@@ -8,6 +8,9 @@ Devise.setup do |config|
   config.use_salt_as_remember_token = true
   config.reset_password_within = 24.hours
 
+  # Configure the class responsible to send e-mails.
+  # config.mailer = "Devise::Mailer"
+
   # ==> ORM configuration
   # Load and configure the ORM. Supports :active_record (default) and
   # :mongoid (bson_ext recommended) by default. Other ORMs may be
@@ -37,7 +40,7 @@ Devise.setup do |config|
   # ==> Configuration for :database_authenticatable
   # For bcrypt, this is the cost for hashing the password and defaults to 10. If
   # using other encryptors, it sets how many times you want the password re-encrypted.
-  config.stretches = Rails.env.test? ? 1 : 10
+  config.stretches = 10
 
   # Define which will be the encryption algorithm. Devise also supports encryptors
   # from others authentication tools as :clearance_sha1, :authlogic_sha512 (then
@@ -127,7 +130,7 @@ Devise.setup do |config|
   # Configure sign_out behavior.
   # By default sign_out is scoped (i.e. /users/sign_out affects only :user scope).
   # In case of sign_out_all_scopes set to true any logout action will sign out all active scopes.
-  config.sign_out_all_scopes = true
+  config.sign_out_all_scopes = false
 
   # ==> Navigation configuration
   # Lists the formats that should be treated as navigational. Formats like

data/config/locales/devise.en.yml

@@ -10,7 +10,7 @@ en:
       unauthenticated: 'Please sign in.'
       unconfirmed: 'You have to confirm your account before continuing.'
       locked: 'Your account is locked.'
-      invalid: 'Invalid username or password.'
+      invalid: 'Invalid email or password.'
       invalid_token: 'Invalid authentication token.'
       timeout: 'Your session expired, please sign in again to continue.'
       inactive: 'Your account has been suspended.'

data/config/locales/devise_invitable.en.yml

@@ -2,7 +2,7 @@ en:
   devise:
     invitations:
       send_instructions: 'An invitation email has been sent to %{email}.'
-      invitation_token_invalid: 'The invitation token provided is not valid!'
+      invitation_token_invalid: 'The invitation token provided is not valid! WTF MAN'
       updated: 'Your password was set successfully. You are now signed in.'
       no_invitations_remaining: "No invitations remaining"
     mailer:

data/config/locales/en.yml

@@ -22,15 +22,13 @@
   time:
     formats:
       default: "%B %d, %Y %I:%M %p"
-      short: "%m/%d/%Y %l:%M %p"
+      short: "%m/%d/%Y %I:%M %p"
       slashed_date: "%m/%d/%Y"
       day_time: "%a, %b %d %l:%M %P"
       day_time_at: "%a, %b %d at %I:%M %P"
       date: "%B %d, %Y"
       long_date: "%B %d, %Y %I:%M %p"
-      long_with_day: "%A, %b %d %Y %l:%M %p"
-      long_with_abbrviated_day: "%a, %b %d %Y %l:%M %p"
-      abbreviated_day: "%a"
+      long_with_day: "%A, %b %d %Y %I:%M %p"
       time: "%I:%M %p"
       day: "%A"
       date_for_input: "%Y-%m-%d"
@@ -178,18 +176,6 @@
       even: "must be even"
 
   activerecord:
-    attributes:
-      seasonal_membership_type:
-        starts_at: "Membership begins"
-        ends_at: "Membership ends"
-      pass_type:
-        tickets_allowed: "Number of Tickets"
-        starts_at: "Pass Starts"
-        ends_at: "Pass Ends"
-      organization:
-        # Blithering hack to get around Rails' miserable validation message handling
-        cached_slug: "Sorry,"
-
     errors:
       template:
         header:
@@ -210,7 +196,6 @@
       athena_performance:
         datetime: "Date and time"
 
-
   athena_performance:
     state:
       pending: "Pending"
@@ -218,7 +203,7 @@
       on_sale: "In Widget"
       off_sale: "Not in Widget"
 
-  regular_donation_kit: "501(c)(3) Donation Kit"
+  regular_donation_kit: "Charity Donation Kit"
   sponsored_donation_kit: "Sponsored Donation Kit"
   ticketing_kit: "Paid Event Ticketing Kit"
   reseller_kit: "Reseller Kit"

data/config/routes.rb

@@ -1,38 +1,5 @@
 Rails.application.routes.draw do
 
-  namespace :mobile do
-    resources :users, :only => [] do
-      collection do
-        post :sign_in
-      end
-    end
-    resource :dashboard, :only => :show, :controller => :dashboard
-    resources :organizations, :only => [] do
-      resources :events, :only => :index
-    end
-    resources :events, :only => [:index] do
-      resources :shows, :only => :index
-    end
-    resources :shows, :only => [:index, :show] do
-      resources :orders, :only => :index
-    end
-    resources :orders, :only => [:index, :show] do
-      collection { post :validate }
-      member { post :validate }
-    end
-    resources :tickets, :only => [:show] do
-      collection do
-        post :validate
-        post :unvalidate
-      end
-      member do
-        post :validate
-        post :unvalidate
-        get :order
-      end
-    end
-  end
-
   namespace :api do
     resources :events, :only => :show
     resources :tickets, :only => :index
@@ -47,13 +14,9 @@ Rails.application.routes.draw do
   scope ':organization_slug' do
     namespace :store do
       resources :events, :only => [:show, :index]
-      resources :memberships, :only => [:show, :index]
-      resources :passes, :only => [:show, :index]
-      resources :rolling_membership_types,  :controller => :membership_types
-      resources :seasonal_membership_types, :controller => :membership_types
+      resources :memberships, :only => :index
       resources :shows, :only => :show
       resource  :checkout, :only => :create
-      resources :retrievals, :only => [:index, :create]
 
       resource :order, :only => :destroy
       get "order", :to => "orders#show"
@@ -67,21 +30,17 @@ Rails.application.routes.draw do
   namespace :store do
     resources :events, :only => :show, :as => :old_storefront_event
     resources :shows, :only => :show
-    # resource :checkout, :only => :create
-    resource  :checkout, :only => :create do
-      get "dook", :to => "checkouts#dook"
-    end
+    resource :checkout, :only => :create
   end
 
-  devise_for :members, :controllers => { :invitations => "members/invitations", :passwords => "members/passwords", :sessions => "members/sessions"}
-  devise_for :users, :controllers => {:sessions => "users/sessions"}
+  devise_for :members
+  devise_for :users
   devise_scope :user do
     get "sign_up", :to => "devise/registrations#new"
   end
 
   namespace :members do
     root :to => "index#index"
-    resources :people, :only => :update
   end
 
   resources :organizations do
@@ -117,12 +76,6 @@ Rails.application.routes.draw do
     get :requirements, :on => :collection
   end
 
-  resources :membership_kits, :only => [ :edit, :update ]
-  resources :passes_kits, :only => [ :edit, :update ]
-  resources :passes_reports, :only => [:index]
-
-  resources :regular_donation_kits, :only => [ :edit, :update ]
-
   resources :reports, :only => :index
   resources :statements, :only => [ :index, :show ] do
     resources :slices, :only => [ :index ] do
@@ -134,29 +87,14 @@ Rails.application.routes.draw do
 
   def people_actions
     resources :actions
-    resources :passes, :only => [:index] do
-      collection do
-        post :bulk_update
-        post :reminder
-      end
-    end   
-    
-    resources :relationships, :only => :index
     resources :memberships do
       collection do
         post :bulk_update
       end
     end
-
-    member do
-      post :reset_password
-    end
-    resources :membership_comps, :only => :new
-    resources :membership_cancellations, :only => [:new, :create]
-    resources :membership_changes, :only => :create
+    resources :membership_awards, :only => :new
 
     ["get_action",
-     "change_action",
      "refund_action",
      "join_action",
      "hear_action",
@@ -184,16 +122,9 @@ Rails.application.routes.draw do
     people_actions
   end
 
-  resources :households do
-    collection do
-      get :suggested
-      put "suggested/:suggested_id" => "households#ignore_suggested", :as => "ignore_suggested"
-    end
-  end
-
   def shared_search_segment_routes
     resources :actions, :only => [:new, :create]
-    resources :membership_comps, :only => :new
+    resources :membership_awards, :only => :new
 
     member do
       post :tag
@@ -211,13 +142,6 @@ Rails.application.routes.draw do
     shared_search_segment_routes
   end
 
-  resources :console_sales do
-    collection do
-      get  "/events/:event_id", :action => :events
-      get  "/shows/:show_id", :action => :shows
-    end
-  end
-
   resources :events do
     member do
       get :widget
@@ -229,22 +153,17 @@ Rails.application.routes.draw do
       get :messages
     end
     resources :discounts
-    resources :events_pass_types
     resources :shows do
-      resource :sales, :only => [:new, :create, :show, :update] do
-        get :door_list, :on => :collection
-      end
+      resource :sales, :only => [:new, :create, :show, :update]
       member do
         get :door_list
         post :published
         post :unpublished
-        post :on_sale
-        post :off_sale
       end
       collection do
-        get  :calendar
-        get  :upcoming
-        get  "/:year/:month", :as => :monthly, :action => :index
+        post :built
+        post :on_sale
+        get :calendar
       end
     end
     resource :venue, :only => [:edit, :update]
@@ -256,7 +175,7 @@ Rails.application.routes.draw do
         put :validated
         put :unvalidated
       end
-
+      
       collection do
         delete :delete
         put :on_sale
@@ -285,8 +204,6 @@ Rails.application.routes.draw do
   resources :orders do
     resource :assignment, :only => [ :new, :create ]
     collection do
-      get :membership
-      get :passes
       get :sales
     end
     member do
@@ -301,12 +218,8 @@ Rails.application.routes.draw do
   resources :returns, :only => :create
   resources :comps, :only => [ :new, :create ]
   resources :merges, :only => [ :new, :create ]
-  resources :pass_types
   resources :membership_types
-  resources :rolling_membership_types,  :controller => :membership_types
-  resources :seasonal_membership_types, :controller => :membership_types
-  resources :membership_comps, :only => :create
-  resources :member_cards, :only => :new
+  resources :membership_awards, :only => :create
 
   resources :imports do
     member do
@@ -323,10 +236,8 @@ Rails.application.routes.draw do
   match '/recent_activity' => 'index#recent_activity', :as => :recent_activity
   match '/events/:event_id/charts/' => 'events#assign', :as => :assign_chart, :via => "post"
   match '/dashboard' => 'index#dashboard', :constraints => lambda{|r| r.env["warden"].authenticate?}
-  match ':organization_slug/whats-my-pass', :controller => 'store/retrievals', :action => 'index'
 
   get ':organization_slug/:controller(/:action(/:id))', controller: /store\/[^\/]+/
-  match '/:organization_slug' => 'store/events#index', :as => :store_organization_events
 
   root :to => 'index#dashboard'
 

data/lib/artfully_ose.rb

@@ -1,11 +1,11 @@
-require "devise"
-require "devise_invitable"
-require "devise_suspendable"
 require "artfully_ose/engine"
 require "artfully_ose/common_abilities"
 require "artfully_ose/core_ext"
 require "transitions"
 require "active_record/transitions"
+require "devise"
+require "devise_invitable"
+require "devise_suspendable"
 require "slugged"
 
 require "active_merchant"
@@ -44,7 +44,5 @@ require "set_watch_for"
 require "swiper"
 require "slicer"
 
-require 'rqrcode_png'
-
 module ArtfullyOse
-end
+end

data/lib/artfully_ose/common_abilities.rb

@@ -69,18 +69,12 @@ module ArtfullyOse
 
     def person_abilities_for(user)
       can :manage, Person do |person|
-        user.current_organization.can? :manage, person
+        (user.current_organization.can? :manage, person) || (current_member.person.id == person.id)
       end
 
       can :manage, Segment do |segment|
         user.current_organization.can?(:manage, segment)
       end
     end
-
-    def household_abilities_for(user)
-      can :manage, Household do |household|
-        (user.current_organization.can? :manage, household)
-      end
-    end
   end
-end
+end

data/lib/artfully_ose/engine.rb

@@ -1,21 +1,12 @@
 module ArtfullyOse
   class Engine < ::Rails::Engine
-
-    if Rails.env.test?
-      initializer 'artfully_ose.factories', :after => 'factory_girl.set_factory_paths' do
-        puts 'ArtfullyOse: Setting up additional FactoryGirl paths'
-        FactoryGirl.definition_file_paths << File.expand_path('../../../spec/factories', __FILE__) if defined?(FactoryGirl)
-      end
-    end
-
     initializer "artfully_ose.braintree_config" do |app|
       puts "ArtfullyOse: Initializing Braintree config"
-      BraintreeConfig      = Struct.new(:merchant_account_id, :merchant_id, :public_key, :private_key)
+      BraintreeConfig = Struct.new(:merchant_id, :public_key, :private_key)
       app.config.braintree = BraintreeConfig.new
-      app.config.braintree.merchant_account_id = ENV['BRAINTREE_MERCHANT_ACCOUNT_ID']
-      app.config.braintree.merchant_id         = ENV['BRAINTREE_MERCHANT_ID']
-      app.config.braintree.public_key          = ENV['BRAINTREE_PUBLIC_KEY']
-      app.config.braintree.private_key         = ENV['BRAINTREE_PRIVATE_KEY']
+      app.config.braintree.merchant_id   = ENV['BRAINTREE_MERCHANT_ID']
+      app.config.braintree.public_key    = ENV['BRAINTREE_PUBLIC_KEY']
+      app.config.braintree.private_key   = ENV['BRAINTREE_PRIVATE_KEY']
     end
     
     initializer "artfully_ose.s3_config" do |app|
@@ -29,7 +20,6 @@ module ArtfullyOse
     
     initializer "artfully_ose.payment_model_paths" do |app|
       puts "ArtfullyOse: Initializing payment model paths"
-      puts config.root
       app.config.payment_model_paths       = []
       app.config.payment_model_paths      += Dir["#{config.root}/app/models/payments/*.rb"]
     end
@@ -42,31 +32,17 @@ module ArtfullyOse
     
     initializer "artfully_ose.google_analytics_config" do |app|
       puts "ArtfullyOse: Initializing Google Analytics config"
-      GoogleAnalytcsConfig = Struct.new(:account, :storefront_account, :domain)
-      app.config.google_analytics                       = GoogleAnalytcsConfig.new
-      app.config.google_analytics.account               = ENV['GA_ACCOUNT']
-      app.config.google_analytics.storefront_account    = ENV['GA_STOREFRONT_ACCOUNT']
-      app.config.google_analytics.domain                = ENV['GA_DOMAIN']
+      GoogleAnalytcsConfig = Struct.new(:account, :domain)
+      app.config.google_analytics           = GoogleAnalytcsConfig.new
+      app.config.google_analytics.account   = ENV['GA_ACCOUNT']
+      app.config.google_analytics.domain    = ENV['GA_DOMAIN']
     end
    
     initializer "artfully_ose.autoload_paths", :before => :set_autoload_paths do |app|
-      # First level sub-directories only
-      model_paths = [
-        "#{config.root}/app/models/actions",
-        "#{config.root}/app/models/database_views",
-        "#{config.root}/app/models/discounts",
-        "#{config.root}/app/models/imports",
-        "#{config.root}/app/models/job",
-        "#{config.root}/app/models/kits",
-        "#{config.root}/app/models/orders",
-        "#{config.root}/app/models/payments",
-      ]
-
       puts "ArtfullyOse: Setting up additional autoload paths"
-      app.config.autoload_paths += model_paths
-
+      app.config.autoload_paths += Dir["#{config.root}/app/models/**/"]
     end
-
+    
     config.generators do |g|
       g.test_framework :rspec, :view_specs => false
     end

data/lib/artfully_ose/version.rb

@@ -1,3 +1,3 @@
 module ArtfullyOse
-  VERSION = "1.2.0.beta.1"
+  VERSION = "1.2.0.pre"
 end