mindapp 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fbc93f8fc1b361c54e1f33c87ed76eb7315bf1b
-  data.tar.gz: 9a5a2f3a2dc26803f34f7c17d37871da864590e7
+  metadata.gz: 1ae3a12a90d64de82b3bccef37f24fde071a639c
+  data.tar.gz: 6bd400b13017d054771976a07b35e0583326168d
 SHA512:
-  metadata.gz: 90b38731142c98f6bbb3956e6061e23d6582bda3deec3933a21d8f4444d6eed0a7302da2277bce7936fa04047dc1d81e8282a9c11df9360be7689446f842aa33
-  data.tar.gz: 5e5fd77b10976f97304a5590ba7fc1cae28f2dc810f502f8e05df6f4ed5e21857111f2e99f9cf5f270d9f19f7e8dbb9171b4bf0853d114ada60e5999df2b3420
+  metadata.gz: 2a98cdca223168ea047bffb59e1cad500098f6d3caa799926ef264877e4abc07afc7d0caf35fd27c4c8ea74aca3e6eb57364a73dd12d3b9985ef46a24fb40e69
+  data.tar.gz: 0f14953ff04e32536ae16722067b1d191e9fbddf5e9892360aa6387a8858b94c59f7a26737e3c4dc1fc427745729cc64ffe2c8ac574a868b4064aed442cccce0

data/README.md

@@ -2,6 +2,10 @@
 
 I like to develop application using Ruby on Rails. I find that most of my projects has some common tasks such as basic design, user administration, logging, workflow, etc. So I decide to use mind map to act as a language to explain what I want and have the tool generates the application that conform to standard framework so I can then customize everything later on. Mind map is used in design phase where it generates models and controller, in execution phase where it controls the work flow, and also use to generate documentation. System Analyst could use mind map to communicate with technical team to align their requirements and help in development.
 
+## Changelog
+
+* v0.0.8 update for Rails 4
+
 ## Prerequisites
 
 These versions works for sure but others may do.
@@ -64,16 +68,19 @@ generate mindapp application
 
     $ rails generate mindapp:install
 
-it will ask to overwrite the seeds.rb file, enter y, then run bundle again to install additional gems added by mindapp
+Then run bundle again to install additional gems added by mindapp
 
     $ bundle
 
 The next step is create admin user
 
-    $ rake db:seed
+    $ rake mindapp:seed
 
 now the application is ready, start it as any Rails application
 
+**Note** if you have nokogiri error then you can comment it out in Gemfile. Nokogiri is used
+for mindapp/doc only.
+
     $ rails server
 
 go to http://localhost:3000, click *Sign In* on the left menu, and enter user name `admin` and password `secret`

data/lib/generators/mindapp/install_generator.rb

@@ -12,10 +12,11 @@ module Mindapp
 
         route "resources :identities"
         route "resources :sessions"
-        route "match '/auth/:provider/callback' => 'sessions#create'"
-        route "match '/auth/failure' => 'sessions#failure'"
-        route "match '/logout' => 'sessions#destroy', :as => 'logout'"
-        route "match ':controller(/:action(/:id))(.:format)'"
+        route "post '/auth/:provider/callback' => 'sessions#create'"
+        route "get '/auth/failure' => 'sessions#failure'"
+        route "get '/logout' => 'sessions#destroy', :as => 'logout'"
+        route "get ':controller(/:action(/:id))(.:format)'"
+        route "post ':controller(/:action(/:id))(.:format)'"
       end
 
       def setup_env
@@ -25,7 +26,6 @@ module Mindapp
         # gem "bson_ext", "1.5.1"
         # gem "mongoid"
         # run "bundle install"
-        generate "mongoid:config"
         # generate "rspec:install"
         inject_into_file 'config/application.rb', :after => 'require "active_resource/railtie"' do
           "\nrequire 'mongoid/railtie'\n"
@@ -77,9 +77,6 @@ IMAGE_LOCATION = "upload"
         inject_into_file 'config/environments/production.rb', :after => 'config.assets.compile = false' do
           "\n  config.assets.compile = true"
         end
-        inject_into_file 'config/mongoid.yml', :after => '  # raise_not_found_error: true' do
-          "\n    raise_not_found_error: false"
-        end
       end
 
       def setup_omniauth
@@ -116,11 +113,15 @@ end
       end
 
       def setup_gems
-        gem "mongo", '1.5.1'
-        gem "bson_ext", '1.5.1'
-        gem "mongoid"
+        gem "mongo"
+        gem "bson_ext"
+        # gem "mongo", '1.5.1'
+        # gem "bson_ext", '1.5.1'
+        # for Rails 4
+        gem 'mongoid', '~> 4.0.0'
+        # gem "mongoid"
         gem "nokogiri" # use for mindapp/doc
-        gem "rmagick", :require => "RMagick", :platform => "ruby"
+        # gem "rmagick", :require => "RMagick", :platform => "ruby"
         gem 'haml-rails'
         gem "mail"
         gem "prawn"
@@ -138,6 +139,10 @@ end
         end
       end
 
+      def finish
+        puts "Mindapp installation finish, please run bundle install again to install additional gems. Then run rails generate mindapp:mongoid"
+      end
+
     end
   end
 end

data/lib/generators/mindapp/mongoid_generator.rb

@@ -0,0 +1,17 @@
+module Mindapp
+  module Generators
+    class MongoidGenerator < Rails::Generators::Base
+      desc "Set up mongoid config"
+      def setup_mongoid
+        generate "mongoid:config"
+        inject_into_file 'config/mongoid.yml', :after => '  # raise_not_found_error: true' do
+          "\n    raise_not_found_error: false"
+        end
+      end
+      def finish
+        puts "Mongoid configured, please run rake mindapp:seed to set up admin/secret user"
+      end
+
+    end
+  end
+end

data/lib/generators/mindapp/templates/app/controllers/mindapp_controller.rb

@@ -238,7 +238,11 @@ class MindappController < ApplicationController
       if @xvars['p']['return']
         redirect_to @xvars['p']['return'] and return
       else
-        redirect_to :action=>'pending' and return
+        if @user
+          redirect_to :action=>'pending' and return
+        else
+          redirect_to_root and return
+        end
       end
     else
       @xmain.update_attribute :current_runseq, next_runseq.id

data/lib/generators/mindapp/templates/app/mindapp/template/view.html.erb

@@ -4,8 +4,10 @@
 <%#= fields_for doc do |f| %>
   <%#= f.label :rnum, "Reference number" %>
   <%#= f.text_field :rnum %>
-  <%#= f.label :confidential, "Confidentiality" %>
-  <%#= f.select :confidential, [['normal',0],['secret',1],['top secret',2]],{},"data-native-menu"=>"false" %>
+  <!--div>
+    <%#= f.label :confidential, "Confidentiality" , :class=>"ui-input-text" %>
+    <%#= f.select :confidential, [['normal',0],['secret',1],['top secret',2]],{},"data-native-menu"=>"false" %>
+  </div-->
   <%#= f.label :issue_on, "Dated" %>
   <%#= f.date_field :issue_on, "blackDays"=>[0,6] %>
   <%#= f.label :summary, "Summary" %>
@@ -16,6 +18,6 @@
 <%#= label_tag :hotel, "Ungroup field" %>
 <%#= text_field_tag :hotel %>
 <!--div>
-  <%#= label_tag :done1, "Logic field" %>
+  <%#= label_tag :done1, "Logic field", :class=>"ui-input-text" %>
   <%#= select_tag :done1, options_for_select([['Yes', 'y'], ['No', 'n']],'y'), 'data-role'=>"slider" %>
 </div-->

data/lib/generators/mindapp/templates/app/models/identity.rb

@@ -2,7 +2,7 @@ class Identity
   include Mongoid::Document
   include OmniAuth::Identity::Models::Mongoid
   self.auth_key 'code'
-  
+
   field :code, :type => String
   field :email, :type => String
   field :password_digest, :type => String
@@ -10,5 +10,5 @@ class Identity
   validates_presence_of :code
   validates_uniqueness_of :code
   validates_uniqueness_of :email
-  validates_format_of :email, :with => /^[-a-z0-9_+\.]+\@([-a-z0-9]+\.)+[a-z0-9]{2,4}$/i
+  # validates_format_of :email, :with => /^[-a-z0-9_+\.]+\@([-a-z0-9]+\.)+[a-z0-9]{2,4}$/i
 end

data/lib/generators/mindapp/templates/app/models/mindapp/notice.rb

@@ -8,6 +8,7 @@ class Mindapp::Notice
   belongs_to :user
 
   def self.recent(user_id, ip)
-    where(unread: true, user_id: user_id, ip: ip).last
+    where(unread: true, ip: ip).last
+    # where(unread: true, user_id: user_id, ip: ip).last
   end
 end

data/lib/generators/mindapp/templates/app/models/mindapp/runseq.rb

@@ -19,6 +19,6 @@ class Mindapp::Runseq
   field :xml, :type => String
   field :ip, :type => String
 
-  scope :form_action, where(:action.in=> ['form','output','pdf'])
+  scope :form_action, ->{where(:action.in=> ['form','output','pdf'])}
 
 end

data/lib/generators/mindapp/templates/app/views/layouts/_head.html.erb

@@ -6,9 +6,8 @@
   <title>eLocal</title>
   <link rel="shortcut icon" href="/assets/favicon.ico" />
   <meta name="viewport" content="width=device-width, minimum-scale=1, maximum-scale=1">
-  <%= stylesheet_link_tag "style", "gma", "sarabun" %>
-  <meta name="description" content="ระบบบริหารงานองค์กรปกครองส่วนท้องถิ่น" />
-  <meta name="keywords" content="อปท, องค์กรปกครองส่วนท้องถิ่น, lao" />
+  <%= stylesheet_link_tag "mindapp", "sarabun" %>
+  <meta name="description" content="Mindapp" />
   <%= javascript_include_tag "jquery.tools.min.js"  %>
   <%= javascript_include_tag "application", "flashobject", "FusionCharts"  %>
 </head>

data/lib/generators/mindapp/templates/app/views/layouts/print.html.erb

@@ -6,7 +6,7 @@
     <meta name="language" content="en, th" />
     <title>eLocal</title>
     <link rel="shortcut icon" href="/assets/favicon.ico" />
-    <%= stylesheet_link_tag "gma", "sarabun", :media=>"all" %>
+    <%= stylesheet_link_tag "sarabun", :media=>"all" %>
   </head>
   <style type="text/css" >
   body {

data/lib/generators/mindapp/templates/app/views/layouts/utf8.html.erb

@@ -3,7 +3,7 @@
   <head>
     <title>eLocal Output</title>
     <meta content='text/html; charset=utf-8' http-equiv='content-type' />
-    <link href='/stylesheets/style.css' rel='stylesheet' type='text/css' media="all"/>
+    <link href='/stylesheets/mindapp.css' rel='stylesheet' type='text/css' media="all"/>
     <%= stylesheet_link_tag "sarabun", :media=>"all" %>
   </head>
   <style type="text/css" >

data/lib/mindapp/helpers.rb

@@ -74,7 +74,7 @@ module Mindapp
       %w(call ws redirect invoke email).include? s
     end
     def set_global
-      $xmain= @xmain ; $runseq = @runseq ; $user = current_user ; $xvars= @xmain.xvars
+      $xmain= @xmain ; $runseq = @runseq ; $user = current_user ; $xvars= @xmain.xvars; $ip = request.env["REMOTE_ADDR"]
     end
     def authorize? # use in pending tasks
       @runseq= @xmain.runseqs.find @xmain.current_runseq
@@ -111,13 +111,15 @@ module Mindapp
       end
     end
     def ma_log(message)
-      if $user
         Mindapp::Notice.create :message => ERB::Util.html_escape(message.gsub("`","'")),
-          :user_id => $user.id, :unread=> true, :ip=> env["REMOTE_ADDR"]
-      else
-        Mindapp::Notice.create :message => ERB::Util.html_escape(message.gsub("`","'")),
-          :unread=> true, :ip=> env["REMOTE_ADDR"]
-      end
+          :unread=> true, :ip=> ($ip || request.env["REMOTE_ADDR"])
+      # if session[:user_id]
+      #   Mindapp::Notice.create :message => ERB::Util.html_escape(message.gsub("`","'")),
+      #     :user_id => $user.id, :unread=> true, :ip=> env["REMOTE_ADDR"]
+      # else
+      #   Mindapp::Notice.create :message => ERB::Util.html_escape(message.gsub("`","'")),
+      #     :unread=> true, :ip=> env["REMOTE_ADDR"]
+      # end
     end
 
     alias :ma_notice :ma_log
@@ -179,7 +181,7 @@ module Mindapp
     # methods that I don't know where they came from
     def current_user
       if session[:user_id]
-        return @user ||= User.find(session[:user_id])
+        return @user ||= User.find(session[:user_id]['$oid'])
       else
         return nil
       end

data/lib/mindapp/version.rb

@@ -1,3 +1,3 @@
 module Mindapp
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/mindapp.gemspec

@@ -6,7 +6,7 @@ require 'mindapp/version'
 Gem::Specification.new do |gem|
   gem.name          = "mindapp"
   gem.version       = Mindapp::VERSION
-  gem.authors       = ["songrit"]
+  gem.authors       = ["Korakot Leemakdej"]
   gem.email         = ["songrit@gmail.com"]
   gem.description   = %q{generate Ruby on Rails app from mind map}
   gem.summary       = %q{generate Ruby on Rails app from mind map}
@@ -18,9 +18,10 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.license  = 'MIT'
 
-  gem.add_dependency('mongo', '= 1.5.1')
-  gem.add_dependency('bson_ext', '= 1.5.1')
-  gem.add_dependency('mongoid')
+  # gem.add_dependency('mongo', '= 1.5.1')
+  # gem.add_dependency('bson_ext', '= 1.5.1')
+  # gem.add_dependency('mongoid')
+
   # gem.add_dependency('nokogiri') # for mindapp/doc
   # gem.add_dependency('haml-rails')
   # gem.add_dependency('mail')

metadata

@@ -1,57 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: mindapp
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
-- songrit
+- Korakot Leemakdej
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-23 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: mongo
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.5.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.5.1
-- !ruby/object:Gem::Dependency
-  name: bson_ext
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.5.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.5.1
-- !ruby/object:Gem::Dependency
-  name: mongoid
-  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'
+date: 2014-11-06 00:00:00.000000000 Z
+dependencies: []
 description: generate Ruby on Rails app from mind map
 email:
 - songrit@gmail.com
@@ -59,13 +17,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - lib/generators/mindapp/USAGE
 - lib/generators/mindapp/install_generator.rb
+- lib/generators/mindapp/mongoid_generator.rb
 - lib/generators/mindapp/templates/app/assets/images/account.png
 - lib/generators/mindapp/templates/app/assets/images/add.png
 - lib/generators/mindapp/templates/app/assets/images/ajax-loader-circle.gif
@@ -290,17 +249,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.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: generate Ruby on Rails app from mind map