json_voorhees 1.0.0 → 1.3.0

data/lib/generators/json_voorhees/setup_app/setup_app_generator.rb

@@ -3,43 +3,40 @@ require 'bundler'
 module JsonVoorhees
   class SetupAppGenerator < Rails::Generators::Base
     source_root File.expand_path('../templates', __FILE__)
-    class_option :arcadex, :type => :boolean, :default => true, :description => "Include arcadex gem and authentication in api_controller"
-    class_option :user, :type => :boolean, :default => true, :description => "Create an engine for the user class"
-    class_option :test, :type => :boolean, :default => false, :description => "Set true if running tests to skip things like bundle update and git"
-    class_option :admin, :type => :boolean, :default => true, :description => "Create an admin page"
-    class_option :active_admin, :type => :boolean, :default => true, :description => "Setup the active_admin gem"
 
     def sprint
     	create_file_structure
+      clone_arcadex
       all_gems
     	run_bundle
     	rspec
     	api_controller
       include_middleware
-      cors_route
-      if options.admin?
-        make_admin
-      end
-      if options.user?
-        make_user
-      end
+      make_admin
+      make_user
       run "rake railties:install:migrations"
       run_db_migrations
     	routes
     	make_controllers
-      if options.arcadex? && options.active_admin?
-        #run "rails generate active_admin:resource arcadex::token"
-        custom_active_admin
-      end
-      if options.active_admin?
-        seed_database
-      end
+      custom_active_admin
+      seed_database
+      initializers
       run "wheneverize"
     	run_git
     end
 
     private
 
+    def clone_arcadex
+      run "git clone https://www.github.com/cleor41/arcadex"
+      run "rm -rf arcadex/.git"
+      run "mv arcadex engines/arcadex"
+    end
+
+    def initializers
+      run "rails g json_voorhees:app_environment"
+    end
+
     def seed_database
       #db/seeds.rb
       inject_into_file "db/seeds.rb", after: "#   Mayor.create(name: 'Emanuel', city: cities.first)\n" do <<-'RUBY'
@@ -56,57 +53,19 @@ module JsonVoorhees
     end
 
     def make_admin
-      if !options.active_admin?
-        if !options.arcadex? && !options.user?
-          run "rails g json_voorhees:app_make_admin --skip-arcadex --skip-user --skip-active_admin"
-        end
-        if !options.arcadex? && options.user?
-          run "rails g json_voorhees:app_make_admin --skip-arcadex --skip-active_admin"
-        end
-        if !options.user? && options.arcadex?
-          run "rails g json_voorhees:app_make_admin --skip-user --skip-active_admin"
-        end
-        if options.user? && options.arcadex?
-          run "rails g json_voorhees:app_make_admin --skip-active_admin"
-        end
-      else
-        if !options.arcadex? && !options.user?
-          run "rails g json_voorhees:app_make_admin --skip-arcadex --skip-user"
-        end
-        if !options.arcadex? && options.user?
-          run "rails g json_voorhees:app_make_admin --skip-arcadex"
-        end
-        if !options.user? && options.arcadex?
-          run "rails g json_voorhees:app_make_admin --skip-user"
-        end
-        if options.user? && options.arcadex?
-          run "rails g json_voorhees:app_make_admin"
-        end
-      end
+      run "rails g json_voorhees:app_make_admin"
     end
 
     def make_user
-      if !options.active_admin?
-        if !options.arcadex?
-          run "rails g json_voorhees:app_make_user --skip-arcadex --skip-active_admin"
-        else
-          run "rails g json_voorhees:app_make_user --skip-active_admin"
-        end
-      else
-        if !options.arcadex?
-          run "rails g json_voorhees:app_make_user --skip-arcadex"
-        else
-          run "rails g json_voorhees:app_make_user"
-        end
-      end
+      run "rails g json_voorhees:app_make_user"
       run_bundle
     end
 
     def include_middleware
       inject_into_file 'config/application.rb', after: "class Application < Rails::Application\n" do <<-'RUBY'
 
-  #So Rails-Api doesn't remove all of the middleware
-  config.api_only = false
+    #So Rails-Api doesn't remove all of the middleware
+    config.api_only = false
 
       RUBY
       end
@@ -120,32 +79,17 @@ module JsonVoorhees
       end
     end
 
-    def cors_route
-      route "#This is to handle the CORS preflight request, it only catches the options action.
-  controller \'api/v1/api\' do
-    match \'*unmatched_route\', :to => \'api/v1/api#route_options\', via: [:options]
-  end"
-    end
-
     def make_controllers
     	generate "controller", "app_index app"
       run "rm -f app/controllers/app_index_controller.rb"
       copy_file "app_index_controller.rb", "app/controllers/app_index_controller.rb"
-    	if !options.active_admin? && options.admin?
-        generate "controller", "main admin"
-        run "rm -f spec/controllers/main_controller_spec.rb"
-      end
       #Copy the views over
       copy_file "views/app", "app/views/app_index/app.html.erb"
       copy_file "views/app_index", "app/views/layouts/app_index.html.erb"
     end
                                                             
     def api_controller
-    	if options.arcadex?
-    		copy_file "api_controller_with_arcadex.rb", "app/controllers/api/v1/api_controller.rb"
-    	else
-    		copy_file "api_controller_no_arcadex.rb", "app/controllers/api/v1/api_controller.rb"
-    	end
+    	copy_file "api_controller_with_arcadex.rb", "app/controllers/api/v1/api_controller.rb"
     end
 
     def rspec
@@ -187,19 +131,14 @@ module JsonVoorhees
       gem 'bcrypt', '~> 3.1.7'
       gem 'type_cartographer'
       gem 'devise', "~> 3.2.4" 
-      if options.arcadex?
-        gem 'arcadex', '~> 1.1.3'
-      end
-      if options.admin?
-        gem 'autoprefixer-rails'
-        gem 'bootstrap-sass', '~> 3.2.0'
-      end
-      if options.active_admin?
-        gem 'activeadmin', :git => 'https://github.com/activeadmin/activeadmin.git', :branch => "master"
-        gem 'defcon', '~> 1.2.3'
-      end
+      gem 'arcadex', :path => "engines/arcadex"
+      gem 'autoprefixer-rails'
+      gem 'bootstrap-sass', '~> 3.2.0'
+      gem 'activeadmin', :git => 'https://github.com/activeadmin/activeadmin.git', :branch => "master"
+      #gem 'defcon', '~> 1.2.3'
       gem 'authorization', :path => "gems/authorization"
       gem 'whenever', :require => false
+      gem 'rack-cors', :require => 'rack/cors'
       #gem 'websocket-rails'
     end
 
@@ -214,10 +153,8 @@ module JsonVoorhees
     end
 
     def run_bundle
-      if !options.test?
-        Bundler.with_clean_env do
-          run "bundle install"
-        end
+      Bundler.with_clean_env do
+        run "bundle install"
       end
     end
 
@@ -228,11 +165,9 @@ module JsonVoorhees
     end
 
     def run_git
-      if !options.test?
-        git :init
-        git add: "."
-        run "git commit -m \"Initial commit\""
-      end
+      git :init
+      git add: "."
+      run "git commit -m \"Initial commit\""
     end
 
   end

data/lib/generators/json_voorhees/setup_app/templates/api_controller_with_arcadex.rb

@@ -1,8 +1,6 @@
 class Api::V1::ApiController < ::ActionController::API
 
   before_action :authenticate_user
-  after_filter :cors_set_access_control_headers
-  skip_before_filter :authenticate_user, :only => [:route_options]
 
   def route_options
     cors_preflight_check
@@ -29,13 +27,18 @@ class Api::V1::ApiController < ::ActionController::API
     end
 
     def set_hash
-      #["current_user","current_token"] Make this true to check for email also
-      @instance_hash = ::Arcadex::Authentication.full_authentication(params,request,false)
+      #["current_owner","current_token"] Make this true to check for email also
+      #@instance_hash = ::Arcadex::Authentication.get_instance(params,request,"Auth-Token")
+      @instance_hash = ::Arcadex::Authentication.authenticate_owner_with_index(params,request,"Auth-Token","Email","email",true)
+      #Ignore the token if the user's account is locked
+      if !current_user.nil? && current_user.locked
+        @instance_hash = nil
+      end
     end
 
     def current_user
       if !@instance_hash.nil?
-        return @instance_hash["current_user"]
+        return @instance_hash["current_owner"]
       else
         return nil
       end
@@ -48,23 +51,5 @@ class Api::V1::ApiController < ::ActionController::API
         return nil
       end
     end
-
-    def cors_set_access_control_headers
-      response.headers['Access-Control-Allow-Origin'] = '*'
-      response.headers['Access-Control-Allow-Methods'] = 'POST, GET, PUT, PATCH, DELETE, OPTIONS'
-      response.headers['Access-Control-Allow-Headers'] = '*, Origin, Content-Type, Accept, Authorization, Token, Auth-Token, Email'
-      response.headers['Access-Control-Expose-Headers'] = '*'
-      response.headers['Access-Control-Max-Age'] = "1728000"
-    end
-     
-    def cors_preflight_check
-      #if request.method == 'OPTIONS'
-        request.headers['Access-Control-Allow-Origin'] = '*'
-        request.headers['Access-Control-Allow-Methods'] = 'POST, GET, PUT, PATCH, DELETE, OPTIONS'
-        request.headers['Access-Control-Allow-Headers'] = '*, X-Requested-With, X-Prototype-Version, Token, Auth-Token, Email'
-        request.headers['Access-Control-Max-Age'] = '1728000'  
-        render :text => '', :content_type => 'text/plain'
-      #end
-    end
     
 end

data/lib/generators/json_voorhees/setup_engine/setup_engine_generator.rb

@@ -28,9 +28,6 @@ module JsonVoorhees
 	  	inject_into_file "config/routes.rb", after: "#{module_name.camelize}::Engine.routes.draw do\n" do <<-'RUBY'
 
 	#root to: "controller_name#index"
-	#scope 'admin' do
-
-	#end
 
 	scope 'api' do
 		scope '1' do

data/lib/json_voorhees/version.rb

@@ -1,3 +1,3 @@
 module JsonVoorhees
-  VERSION = "1.0.0"
+  VERSION = "1.3.0"
 end

data/test/fresh_copy/test_app/Gemfile

@@ -1,37 +1,31 @@
 source 'https://rubygems.org'
 
-gem "json_voorhees", :path => "../../../json_voorhees"
-# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '4.0.4'
 
+# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
+gem 'rails', '4.1.6'
+gem "json_voorhees", :path => "../../../json_voorhees"
 # Use sqlite3 as the database for Active Record
 gem 'sqlite3'
-
 # Use SCSS for stylesheets
-gem 'sass-rails', '~> 4.0.2'
-
+gem 'sass-rails', '~> 4.0.3'
 # Use Uglifier as compressor for JavaScript assets
 gem 'uglifier', '>= 1.3.0'
-
 # Use CoffeeScript for .js.coffee assets and views
 gem 'coffee-rails', '~> 4.0.0'
-
 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
-# gem 'therubyracer', platforms: :ruby
+# gem 'therubyracer',  platforms: :ruby
 
 # Use jquery as the JavaScript library
 gem 'jquery-rails'
-
 # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
 gem 'turbolinks'
-
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-gem 'jbuilder', '~> 1.2'
+gem 'jbuilder', '~> 2.0'
+# bundle exec rake doc:rails generates the API under doc/api.
+gem 'sdoc', '~> 0.4.0',          group: :doc
 
-group :doc do
-  # bundle exec rake doc:rails generates the API under doc/api.
-  gem 'sdoc', require: false
-end
+# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
+gem 'spring',        group: :development
 
 # Use ActiveModel has_secure_password
 # gem 'bcrypt', '~> 3.1.7'
@@ -40,7 +34,8 @@ end
 # gem 'unicorn'
 
 # Use Capistrano for deployment
-# gem 'capistrano', group: :development
+# gem 'capistrano-rails', group: :development
 
 # Use debugger
 # gem 'debugger', group: [:development, :test]
+

data/test/fresh_copy/test_app/Gemfile.lock

@@ -1,38 +1,34 @@
-PATH
-  remote: ../../../json_voorhees
-  specs:
-    json_voorhees (0.2.3)
-      rails (>= 4.0.0)
-
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.0.4)
-      actionpack (= 4.0.4)
-      mail (~> 2.5.4)
-    actionpack (4.0.4)
-      activesupport (= 4.0.4)
-      builder (~> 3.1.0)
-      erubis (~> 2.7.0)
+    actionmailer (4.1.6)
+      actionpack (= 4.1.6)
+      actionview (= 4.1.6)
+      mail (~> 2.5, >= 2.5.4)
+    actionpack (4.1.6)
+      actionview (= 4.1.6)
+      activesupport (= 4.1.6)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    activemodel (4.0.4)
-      activesupport (= 4.0.4)
-      builder (~> 3.1.0)
-    activerecord (4.0.4)
-      activemodel (= 4.0.4)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.4)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.4)
+    actionview (4.1.6)
+      activesupport (= 4.1.6)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+    activemodel (4.1.6)
+      activesupport (= 4.1.6)
+      builder (~> 3.1)
+    activerecord (4.1.6)
+      activemodel (= 4.1.6)
+      activesupport (= 4.1.6)
+      arel (~> 5.0.0)
+    activesupport (4.1.6)
       i18n (~> 0.6, >= 0.6.9)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
       thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    arel (4.0.2)
-    builder (3.1.4)
+      tzinfo (~> 1.1)
+    arel (5.0.1.20140414130214)
+    builder (3.2.2)
     coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
@@ -41,41 +37,41 @@ GEM
       execjs
     coffee-script-source (1.8.0)
     erubis (2.7.0)
-    execjs (2.2.1)
+    execjs (2.2.2)
     hike (1.2.3)
     i18n (0.6.11)
-    jbuilder (1.5.3)
-      activesupport (>= 3.0.0)
-      multi_json (>= 1.2.0)
+    jbuilder (2.2.4)
+      activesupport (>= 3.0.0, < 5)
+      multi_json (~> 1.2)
     jquery-rails (3.1.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.1)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.25.1)
-    minitest (4.7.5)
+    mail (2.6.1)
+      mime-types (>= 1.16, < 3)
+    mime-types (2.4.3)
+    minitest (5.4.2)
     multi_json (1.10.1)
-    polyglot (0.3.5)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.0.4)
-      actionmailer (= 4.0.4)
-      actionpack (= 4.0.4)
-      activerecord (= 4.0.4)
-      activesupport (= 4.0.4)
+    rails (4.1.6)
+      actionmailer (= 4.1.6)
+      actionpack (= 4.1.6)
+      actionview (= 4.1.6)
+      activemodel (= 4.1.6)
+      activerecord (= 4.1.6)
+      activesupport (= 4.1.6)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.4)
-      sprockets-rails (~> 2.0.0)
-    railties (4.0.4)
-      actionpack (= 4.0.4)
-      activesupport (= 4.0.4)
+      railties (= 4.1.6)
+      sprockets-rails (~> 2.0)
+    railties (4.1.6)
+      actionpack (= 4.1.6)
+      activesupport (= 4.1.6)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.3.2)
-    rdoc (4.1.1)
+    rdoc (4.1.2)
       json (~> 1.4)
     sass (3.2.19)
     sass-rails (4.0.3)
@@ -86,25 +82,24 @@ GEM
     sdoc (0.4.1)
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
+    spring (1.1.3)
     sprockets (2.11.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.0.1)
+    sprockets-rails (2.2.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
-      sprockets (~> 2.8)
+      sprockets (>= 2.8, < 4.0)
     sqlite3 (1.3.9)
     thor (0.19.1)
     thread_safe (0.3.4)
     tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    turbolinks (2.3.0)
+    turbolinks (2.4.0)
       coffee-rails
-    tzinfo (0.3.41)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
     uglifier (2.5.3)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
@@ -114,12 +109,12 @@ PLATFORMS
 
 DEPENDENCIES
   coffee-rails (~> 4.0.0)
-  jbuilder (~> 1.2)
+  jbuilder (~> 2.0)
   jquery-rails
-  json_voorhees!
-  rails (= 4.0.4)
-  sass-rails (~> 4.0.2)
-  sdoc
+  rails (= 4.1.6)
+  sass-rails (~> 4.0.3)
+  sdoc (~> 0.4.0)
+  spring
   sqlite3
   turbolinks
   uglifier (>= 1.3.0)

data/test/fresh_copy/test_app/Rakefile

@@ -3,4 +3,4 @@
 
 require File.expand_path('../config/application', __FILE__)
 
-TestApp::Application.load_tasks
+Rails.application.load_tasks

data/test/fresh_copy/test_app/app/assets/stylesheets/application.css

@@ -5,9 +5,11 @@
  * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
  * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
  *
- * You're free to add application-wide styles to this file and they'll appear at the top of the
- * compiled file, but it's generally better to create a new file per style scope.
+ * You're free to add application-wide styles to this file and they'll appear at the bottom of the
+ * compiled file so the styles you add here take precedence over styles defined in any styles
+ * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
+ * file per style scope.
  *
- *= require_self
  *= require_tree .
+ *= require_self
  */

data/test/fresh_copy/test_app/app/views/layouts/application.html.erb

@@ -2,8 +2,8 @@
 <html>
 <head>
   <title>TestApp</title>
-  <%= stylesheet_link_tag    "application", media: "all", "data-turbolinks-track" => true %>
-  <%= javascript_include_tag "application", "data-turbolinks-track" => true %>
+  <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
+  <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
   <%= csrf_meta_tags %>
 </head>
 <body>

data/test/fresh_copy/test_app/bin/rails

@@ -1,4 +1,8 @@
 #!/usr/bin/env ruby
+begin
+  load File.expand_path("../spring", __FILE__)
+rescue LoadError
+end
 APP_PATH = File.expand_path('../../config/application',  __FILE__)
 require_relative '../config/boot'
 require 'rails/commands'

data/test/fresh_copy/test_app/bin/rake

@@ -1,4 +1,8 @@
 #!/usr/bin/env ruby
+begin
+  load File.expand_path("../spring", __FILE__)
+rescue LoadError
+end
 require_relative '../config/boot'
 require 'rake'
 Rake.application.run

data/test/fresh_copy/test_app/bin/spring

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+
+# This file loads spring without using Bundler, in order to be fast
+# It gets overwritten when you run the `spring binstub` command
+
+unless defined?(Spring)
+  require "rubygems"
+  require "bundler"
+
+  if match = Bundler.default_lockfile.read.match(/^GEM$.*?^    spring \((.*?)\)$.*?^$/m)
+    ENV["GEM_PATH"] = ([Bundler.bundle_path.to_s] + Gem.path).join(File::PATH_SEPARATOR)
+    ENV["GEM_HOME"] = ""
+    Gem.paths = ENV
+
+    gem "spring", match[1]
+    require "spring/binstub"
+  end
+end

data/test/fresh_copy/test_app/config/database.yml

@@ -3,23 +3,23 @@
 #
 #   Ensure the SQLite 3 gem is defined in your Gemfile
 #   gem 'sqlite3'
-development:
+#
+default: &default
   adapter: sqlite3
-  database: db/development.sqlite3
   pool: 5
   timeout: 5000
 
+development:
+  <<: *default
+  database: db/development.sqlite3
+
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
-  adapter: sqlite3
+  <<: *default
   database: db/test.sqlite3
-  pool: 5
-  timeout: 5000
 
 production:
-  adapter: sqlite3
+  <<: *default
   database: db/production.sqlite3
-  pool: 5
-  timeout: 5000

data/test/fresh_copy/test_app/config/environment.rb

@@ -2,4 +2,4 @@
 require File.expand_path('../application', __FILE__)
 
 # Initialize the Rails application.
-TestApp::Application.initialize!
+Rails.application.initialize!

data/test/fresh_copy/test_app/config/environments/development.rb

@@ -1,4 +1,4 @@
-TestApp::Application.configure do
+Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
   # In the development environment your application's code is reloaded on
@@ -19,11 +19,19 @@ TestApp::Application.configure do
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
-  # Raise an error on page load if there are pending migrations
+  # Raise an error on page load if there are pending migrations.
   config.active_record.migration_error = :page_load
 
   # Debug mode disables concatenation and preprocessing of assets.
   # This option may cause significant delays in view rendering with a large
   # number of complex assets.
   config.assets.debug = true
+
+  # Adds additional error checking when serving assets at runtime.
+  # Checks for improperly declared sprockets dependencies.
+  # Raises helpful error messages.
+  config.assets.raise_runtime_errors = true
+
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
 end