happy_seed 0.0.11 → 0.0.12

data/lib/happy_seed/version.rb

@@ -1,3 +1,3 @@
 module HappySeed
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: happy_seed
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Will Schenk
@@ -9,48 +9,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-28 00:00:00.000000000 Z
+date: 2015-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.4
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.4
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: thor
   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'
 description: HappySeed is a project that will build up a rails apps using some common
@@ -70,6 +70,7 @@ files:
 - lib/generators/happy_seed/admin/templates/app/admin/campaigns.rb
 - lib/generators/happy_seed/admin/templates/app/admin/dashboard.rb
 - lib/generators/happy_seed/admin/templates/app/admin/newsletter.rb
+- lib/generators/happy_seed/admin/templates/app/admin/user.rb
 - lib/generators/happy_seed/admin/templates/app/controllers/admin/stats_controller.rb
 - lib/generators/happy_seed/admin/templates/app/views/admin/_chart.html.haml
 - lib/generators/happy_seed/admin/templates/docs/README.07.admin.rdoc
@@ -95,6 +96,7 @@ files:
 - lib/generators/happy_seed/base/templates/application_controller.rb
 - lib/generators/happy_seed/base/templates/config/unicorn.rb
 - lib/generators/happy_seed/base/templates/docs/README.00.base.rdoc
+- lib/generators/happy_seed/base/templates/lib/tasks/haml2erb.rake
 - lib/generators/happy_seed/base/templates/spec/controllers/application_controller_spec.rb
 - lib/generators/happy_seed/base/templates/spec/controllers/setup_controller_spec.rb
 - lib/generators/happy_seed/bootstrap/bootstrap_generator.rb
@@ -118,8 +120,10 @@ files:
 - lib/generators/happy_seed/bootstrap/templates/lib/templates/haml/scaffold/show.html.haml
 - lib/generators/happy_seed/bootstrap/templates/lib/templates/rails/scaffold_controller/controller.rb
 - lib/generators/happy_seed/devise/devise_generator.rb
+- lib/generators/happy_seed/devise/templates/app/views/application/_account_dropdown.html.haml
 - lib/generators/happy_seed/devise/templates/app/views/devise/passwords/edit.html.haml
 - lib/generators/happy_seed/devise/templates/app/views/devise/passwords/new.html.haml
+- lib/generators/happy_seed/devise/templates/app/views/devise/registrations/edit.html.haml
 - lib/generators/happy_seed/devise/templates/app/views/devise/registrations/new.html.haml
 - lib/generators/happy_seed/devise/templates/app/views/devise/sessions/new.html.haml
 - lib/generators/happy_seed/devise/templates/docs/README.03.devise.rdoc
@@ -135,15 +139,15 @@ files:
 - lib/generators/happy_seed/jazz_hands/templates/config/initializers/jazz_hands.rb
 - lib/generators/happy_seed/jazz_hands/templates/docs/README.12.jazz_hands.rdoc
 - lib/generators/happy_seed/omniauth/omniauth_generator.rb
-- lib/generators/happy_seed/omniauth/templates/add_name_to_users.rb
 - lib/generators/happy_seed/omniauth/templates/app/controllers/omniauth_callbacks_controller.rb
-- lib/generators/happy_seed/omniauth/templates/app/controllers/users_controller.rb
+- lib/generators/happy_seed/omniauth/templates/app/controllers/registrations_controller.rb
+- lib/generators/happy_seed/omniauth/templates/app/models/form_user.rb
 - lib/generators/happy_seed/omniauth/templates/app/models/identity.rb
-- lib/generators/happy_seed/omniauth/templates/app/views/users/finish_signup.html.haml
-- lib/generators/happy_seed/omniauth/templates/app/views/users/show.html.haml
 - lib/generators/happy_seed/omniauth/templates/docs/README.04.omniauth.rdoc
+- lib/generators/happy_seed/omniauth/templates/make_email_nullable.rb
+- lib/generators/happy_seed/omniauth/templates/spec/factories/oauth.rb
+- lib/generators/happy_seed/omniauth/templates/spec/features/registration_spec.rb
 - lib/generators/happy_seed/omniauth/templates/spec/models/identity_spec.rb
-- lib/generators/happy_seed/omniauth/templates/user.rb
 - lib/generators/happy_seed/plugin/plugin_generator.rb
 - lib/generators/happy_seed/plugin/templates/.autotest
 - lib/generators/happy_seed/plugin/templates/.rspec
@@ -164,6 +168,7 @@ files:
 - lib/generators/happy_seed/static/static_generator.rb
 - lib/generators/happy_seed/static/templates/.gitignore
 - lib/generators/happy_seed/static/templates/Gemfile
+- lib/generators/happy_seed/static/templates/Gemfile.lock
 - lib/generators/happy_seed/static/templates/config.rb
 - lib/generators/happy_seed/static/templates/data/site.yml
 - lib/generators/happy_seed/static/templates/source/images/.gitkeep
@@ -245,8 +250,6 @@ files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/config/secrets.yml
-- test/dummy/db/test.sqlite3
-- test/dummy/log/test.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
@@ -263,17 +266,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: HappySeed is a project that will build up a rails apps using some common
@@ -307,8 +310,6 @@ test_files:
 - test/dummy/config/routes.rb
 - test/dummy/config/secrets.yml
 - test/dummy/config.ru
-- test/dummy/db/test.sqlite3
-- test/dummy/log/test.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html

data/lib/generators/happy_seed/omniauth/templates/add_name_to_users.rb

@@ -1,5 +0,0 @@
-class AddNameToUsers < ActiveRecord::Migration
-  def change
-    add_column :users, :name, :string
-  end
-end

data/lib/generators/happy_seed/omniauth/templates/app/controllers/users_controller.rb

@@ -1,31 +0,0 @@
-class UsersController < ApplicationController
-  before_action :set_user, :only => :finish_signup
-  before_filter :authenticate_user!, :except => :finish_signup
-
-  def show
-    @user = current_user
-  end
-
-  def finish_signup
-    if request.patch? && params[:user] #&& params[:user][:email]
-      if current_user.update(user_params)
-        # current_user.skip_reconfirmation!
-        sign_in(current_user, :bypass => true)
-        redirect_to current_user, notice: 'Your profile was successfully updated.'
-      else
-        @show_errors = true
-      end
-    end
-  end
-  
-  private
-    def set_user
-      @user = User.find(params[:id])
-    end
-
-    def user_params
-      accessible = [ :name, :email ] # extend with your own params
-      accessible << [ :password, :password_confirmation ] unless params[:user][:password].blank?
-      params.require(:user).permit(accessible)
-    end
-end

data/lib/generators/happy_seed/omniauth/templates/app/views/users/finish_signup.html.haml

@@ -1,26 +0,0 @@
-.container
-  .row
-    .col-lg-6.col-lg-offset-3.col-md-6.col-md-offset-3.col-sm-8.col-sm-offset-2
-      .panel.panel-default.only
-
-        .panel-heading
-          Add Email
-
-        .panel-body
-          = form_for(current_user, :as => 'user', :url => finish_signup_path(current_user), :html => { role: 'form'}) do |f|
-            - if @show_errors && current_user.errors.any?
-              #error_explanation
-                - current_user.errors.full_messages.each do |msg|
-                  = msg
-                  %br
-
-            .form-group                  
-              = f.label :email, :class=>'control-label col-sm-3'
-              .col-sm-9= f.text_field :email, :autofocus => true, :value => '', class: 'form-control input-lg', placeholder: 'Example: email@me.com'
-
-              %p.col-sm-9.help-block
-                Please confirm your email address. No spam.
-
-            .form-group
-              .col-lg-9.col-lg-offset-3
-                = f.submit "Continue", :class=>'btn btn-primary form-control'

data/lib/generators/happy_seed/omniauth/templates/app/views/users/show.html.haml

@@ -1,5 +0,0 @@
-= @user.email
-
-%ul
-  - @user.identities.each do |i|
-    %li= link_to "Connected to #{i.provider}"

data/lib/generators/happy_seed/omniauth/templates/user.rb

@@ -1,53 +0,0 @@
-
-  TEMP_EMAIL_PREFIX = 'change@me'
-  TEMP_EMAIL_REGEX = /\Achange@me/
-
-  has_many :identities
-
-  # validates_format_of :email, :without => TEMP_EMAIL_REGEX, on: :update
-
-  def self.find_for_oauth(auth, signed_in_resource = nil)
-
-    # Get the identity and user if they exist
-    identity = Identity.find_for_oauth(auth)
-
-    # If a signed_in_resource is provided it always overrides the existing user
-    # to prevent the identity being locked with accidentally created accounts.
-    # Note that this may leave zombie accounts (with no associated identity) which
-    # can be cleaned up at a later date.
-    user = signed_in_resource ? signed_in_resource : identity.user
-
-    # Create the user if needed
-    if user.nil?
-
-      # Get the existing user by email if the provider gives us a verified email.
-      # If no verified email was provided we assign a temporary email and ask the
-      # user to verify it on the next step via UsersController.finish_signup
-      email_is_verified = auth.info.email && (auth.info.verified || auth.info.verified_email)
-      email = auth.info.email if email_is_verified
-      user = User.where(:email => email).first if email
-
-      # Create the user if it's a new registration
-      if user.nil?
-        user = User.new(
-          # name: auth.extra.raw_info.name,
-          #username: auth.info.nickname || auth.uid,
-          email: email ? email : "#{TEMP_EMAIL_PREFIX}-#{auth.uid}-#{auth.provider}.com",
-          password: Devise.friendly_token[0,20]
-        )
-        # user.skip_confirmation!
-        user.save!
-      end
-    end
-
-    # Associate the identity with the user if needed
-    if identity.user != user
-      identity.user = user
-      identity.save!
-    end
-    user
-  end
-
-  def email_verified?
-    self.email && self.email !~ TEMP_EMAIL_REGEX
-  end

data/test/dummy/log/test.log

@@ -1,5 +0,0 @@
-   (0.1ms)  begin transaction
--------------------------
-HappySeedTest: test_truth
--------------------------
-   (0.0ms)  rollback transaction