happy_seed 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1579e2f69715b0bd19065cf3edf4e9c0a5bf7cd
-  data.tar.gz: 719b96e3c0503aedb854c2a1e13c7a2fafbe46bc
+  metadata.gz: 9c2387bf98dd8eba98bb76cdba96ddb9e9c4b885
+  data.tar.gz: a15292d591236f761dbb84b612307e170bd7e8ba
 SHA512:
-  metadata.gz: 247c7d4f76ad06725ab4adc57d939fd85276acbdaa12aa65ef97ef4aceb2253aa7b363710cf0fd6ffbfb9f3638b976378b39868f0d1245b1745d44341f66bd78
-  data.tar.gz: 749c20258801a4c31575db54a85b14bb38c012f27b684a6807cb6ea76b85a287aa79ecb62cc63649b655146affca7b54e9d47706165d65a06866ea66eea06cc2
+  metadata.gz: b3bbf3a5bc46701938ab6d74c79466ed398f09b2347cfd241aa4321b861c3dfff510f15b954c2166d02bbd1ba78c1bbfa8b533e47752ab9684947af17dac86b1
+  data.tar.gz: 90802c40fa1e1c135a7cd74355ac777b1b755ab3ef66a1568ba4f8aae842cdbc24a1bdb5e2cd0f004f8c3006b725835fb63cf941ed753f1e2fb8a74e62b07e59

data/lib/generators/happy_seed/bootstrap/templates/app/helpers/application_helper.rb

@@ -16,4 +16,8 @@ module ApplicationHelper
       nil
     end
   end
+
+  def page_title
+    @title || controller_name.gsub( /Controller/, "" ).humanize
+  end
 end

data/lib/generators/happy_seed/bootstrap/templates/app/views/application/_footer.html.haml

@@ -1,8 +1,7 @@
 %footer#footer
-  .container
-    .row
-      .col-xs-6
-        %h3 AppName
-      .col-xs-6.text-right
-        %small.copyright
-          T, Copyright © #{ Date.today.year }
+  .row
+    .col-xs-6
+      %h3 AppName
+    .col-xs-6.text-right
+      %small.copyright
+        T, Copyright © #{ Date.today.year }

data/lib/generators/happy_seed/bootstrap/templates/app/views/application/_head.html.haml

@@ -2,7 +2,7 @@
   %meta{ :charset => 'utf-8' }/
   %meta{ 'http-equiv' => 'X-UA-Compatible', :content => 'IE=edge,chrome=1' }/
 
-  = display_meta_tags :site => 'New'
+  = display_meta_tags :site => 'Seed Site', :title => page_title, :reverse => true
 
   %meta{ :name => 'description', :content => '' }/
   %meta{ :name => 'viewport', :content => 'width=device-width' }/

data/lib/generators/happy_seed/bootstrap/templates/app/views/application/_header.html.haml

@@ -1,16 +1,15 @@
-%header#top.navbar{:role=>:banner}
-  .container
-    .navbar-header
-      %button.navbar-toggle{:type=>:button, 'data-toggle'=>:collapse, 'data-target'=>'.navbar-collapse'}
-        %span.sr-only Toggle navigations
-        %span.icon-bar
-        %span.icon-bar
-        %span.icon-bar
-      = link_to root_path, :class=>'navbar-brand' do
-        %span.glyphicon.glyphicon-cloud
-        App name
-    %nav.collapse.navbar-collapse{:role=>:navigation}
-      %ul.nav.navbar-nav
-        %li= link_to 'Contact', '#'
-        %li= link_to 'Blog', '#'
-      / USER NAV
+%header#top.navbar.navbar-default{:role=>:banner}
+  .navbar-header
+    %button.navbar-toggle{:type=>:button, 'data-toggle'=>:collapse, 'data-target'=>'.navbar-collapse'}
+      %span.sr-only Toggle navigations
+      %span.icon-bar
+      %span.icon-bar
+      %span.icon-bar
+    = link_to root_path, :class=>'navbar-brand' do
+      %span.glyphicon.glyphicon-cloud
+      App name
+  %nav.collapse.navbar-collapse{:role=>:navigation}
+    %ul.nav.navbar-nav
+      %li= link_to 'Contact', '#'
+      %li= link_to 'Blog', '#'
+    / USER NAV

data/lib/generators/happy_seed/devise/devise_generator.rb

@@ -21,6 +21,7 @@ module HappySeed
 
         directory 'app'
         directory 'docs'
+        directory 'test'
 
         application(nil, env: "development") do
           "config.action_mailer.default_url_options = { host: 'localhost:3000' }"
@@ -28,12 +29,12 @@ module HappySeed
 
         gsub_file 'app/views/application/_header.html.haml', "/ USER NAV", <<-'RUBY'
 %ul.nav.navbar-nav.navbar-right
-        - if user_signed_in?
-          %li= link_to 'Sign Out', destroy_user_session_path, :method=>:delete
-        - else
-          / CONNECT
-          %li= link_to 'Sign In', new_user_session_path
-          %li= link_to 'Sign Up', new_user_registration_path
+      - if user_signed_in?
+        %li= link_to 'Sign Out', destroy_user_session_path, :method=>:delete
+      - else
+        / CONNECT
+        %li= link_to 'Sign In', new_user_session_path
+        %li= link_to 'Sign Up', new_user_registration_path
 RUBY
       end
     end

data/lib/generators/happy_seed/devise/templates/app/views/devise/registrations/new.html.haml

@@ -1,3 +1,4 @@
+- @title = "Sign Up"
 .container
   .row
     .col-lg-6.col-lg-offset-3.col-md-6.col-md-offset-3.col-sm-8.col-sm-offset-2

data/lib/generators/happy_seed/devise/templates/app/views/devise/sessions/new.html.haml

@@ -1,3 +1,4 @@
+- @title = "Sign In"
 .container
   .row
     .col-lg-6.col-lg-offset-3.col-md-6.col-md-offset-3.col-sm-8.col-sm-offset-2

data/lib/generators/happy_seed/happy_seed_generator.rb

@@ -27,10 +27,20 @@ module HappySeed
           end
           append_to_file ".env", "#{provider.upcase}_APP_ID=\n#{provider.upcase}_APP_SECRET=\n"
 
-          inject_into_file 'app/views/application/_header.html.haml', "          %li= link_to 'sign in with #{provider}', user_omniauth_authorize_path(:#{provider})\n", after: "/ CONNECT\n"
+          inject_into_file 'app/views/application/_header.html.haml', "        %li= link_to 'sign in with #{provider}', user_omniauth_authorize_path(:#{provider})\n", after: "/ CONNECT\n"
           inject_into_file 'app/views/devise/sessions/new.html.haml', "                = link_to 'sign in with #{provider}', user_omniauth_authorize_path(:#{provider})\n                %br\n", after: "/ CONNECT\n"
           inject_into_file 'app/views/devise/registrations/new.html.haml', "                = link_to 'sign in with #{provider}', user_omniauth_authorize_path(:#{provider})\n                %br\n", after: "/ CONNECT\n"
           inject_into_file 'app/controllers/omniauth_callbacks_controller.rb', "\n  def #{provider}\n    generic_callback( '#{provider}' )\n  end\n", before: /\s*def generic_callback/
+          inject_into_file 'app/models/user.rb', :before => "\nend" do <<-"RUBY"
+  def #{provider}
+    identities.where( :provider => "#{provider}" ).first
+  end
+
+  def #{provider}_client
+    @#{provider}_client ||= #{provider.to_s.humanize}.client( access_token: #{provider}.accesstoken )
+  end
+RUBY
+          end
         end
      
         def gem_available?(name)

data/lib/generators/happy_seed/omniauth/omniauth_generator.rb

@@ -25,7 +25,7 @@ module HappySeed
           run "bundle install"
         end
 
-        generate 'model identity user:references provider:string uid:string name:string email:string nickname:string image:string phone:string urls:string'
+        generate 'model identity user:references provider:string accesstoken:string uid:string name:string email:string nickname:string image:string phone:string urls:string'
         remove_file 'app/models/identity.rb'
         directory 'app'
         route "match '/profile/:id/finish_signup' => 'users#finish_signup', via: [:get, :patch], :as => :finish_signup"
@@ -35,6 +35,7 @@ module HappySeed
         insert_into_file "app/models/user.rb", File.read( find_in_source_paths( "user.rb" ) ), :before => "\nend\n"
         insert_into_file "app/views/application/_header.html.haml", "          %li= link_to 'Account', user_path\n", after: "        - if user_signed_in?\n"
         gsub_file 'config/routes.rb', "devise_for :users\n", "devise_for :users, :controllers => { omniauth_callbacks: 'omniauth_callbacks' }\n"
+
         directory "docs"
       end
 

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

@@ -13,7 +13,8 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
 
   def after_sign_in_path_for(resource)
     if resource.email_verified?
-      super resource
+      root_url
+      # super resource
     else
       finish_signup_path(resource)
     end

data/lib/generators/happy_seed/omniauth/templates/app/models/identity.rb

@@ -6,12 +6,13 @@ class Identity < ActiveRecord::Base
   def self.find_for_oauth(auth)
     identity = find_by(provider: auth.provider, uid: auth.uid)
     identity = create(uid: auth.uid, provider: auth.provider) if identity.nil?
+    identity.accesstoken = auth.credentials.token
     identity.name = auth.info.name
     identity.email = auth.info.email
     identity.nickname = auth.info.nickname
     identity.image = auth.info.image
     identity.phone = auth.info.phone
-    identity.urls = auth.info.urls
+    identity.urls = (auth.info.urls || "").to_json
     identity.save
     identity
   end

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

@@ -15,7 +15,7 @@
                   %br
 
             .form-group                  
-              = f.label :email
+              = 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

data/lib/happy_seed/version.rb

@@ -1,3 +1,3 @@
 module HappySeed
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: happy_seed
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Will Schenk