mindapp 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79fa5120369e51b0ac65fe5ab6fab5a4ff0724e8
-  data.tar.gz: adfc0be082982169e73eb807e49135f3f55f503f
+  metadata.gz: b38cbd2721aa733015faa26f605793e2a58e02e9
+  data.tar.gz: 88fac4a7885487f0d58dcad6166595f41b927a0c
 SHA512:
-  metadata.gz: 64e6215bece14fb882a65a5d3098f5ae750210c7e08603ed3f0668b2b6c01a6c7e854f9abc2d67e99a008f5b3e0488a71da2a5d4a8beabdded076d1f7502c188
-  data.tar.gz: a26da1eb86c6434cbbd53856e557f084d4de95f1cc52ed33cdc3ae532de6a28b801fe31e6487899f1902f3fdf601a8bb437cc959e1ebe98747c64578c730f92b
+  metadata.gz: dcc0b8dc75b051edace002bb7365e2b9ba2c5a5110ba88bfeeb78f38a5b85ea248abcd24424988c9661247667130dc4d32cefa0ac25f358e8beeb07da3430239
+  data.tar.gz: 13e08657b059fdc38330e7bf67cdedb9236c9acd82a45b877591a065a7680d3855650cf69cfd86ec26d5a430da150d71f2cb1d77243b53ced38c28472ecfa330

data/README.md

@@ -36,7 +36,7 @@ Then generate and seed (you will be asked to overwrite `db/seeds.rb`) , which wi
 
     $ rails generate mindapp:install
     $ bundle
-    $ rake db:seed
+    $ rake mindapp:seed
 
 Your app is now ready at http://localhost:3000/.
 

data/lib/generators/mindapp/install_generator.rb

@@ -21,10 +21,10 @@ module Mindapp
       def setup_env
         create_file 'README.md', ''
         # bug in mongo ruby driver 1.6.1, wait for mongoid 2.4.7
-        gem "mongo", "1.5.1"
-        gem "bson_ext", "1.5.1"
-        gem "mongoid"
-        run "bundle install"
+        # gem "mongo", "1.5.1"
+        # 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
@@ -107,7 +107,7 @@ end
       end
 
       def gen_user
-        copy_file "seeds.rb","db/seeds.rb"
+        # copy_file "seeds.rb","db/seeds.rb"
       end
 
       def gen_image_store
@@ -116,8 +116,11 @@ end
       end
 
       def setup_gems
+        gem "mongo", '1.5.1'
+        gem "bson_ext", '1.5.1'
+        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"

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

@@ -25,7 +25,7 @@ class MindappController < ApplicationController
       redirect_to action:"pending"
   end
   def ajax_notice
-    if notice=Mindapp::Notice.recent(current_user)
+    if notice=Mindapp::Notice.recent(current_user, env["REMOTE_ADDR"])
       notice.update_attribute :unread, false
       js = "notice('#{notice.message}');"
     else
@@ -388,7 +388,7 @@ class MindappController < ApplicationController
         :user_id=>current_user.try(:id),
         :custom_controller=>custom_controller,
         :host=>request.host,
-        :referer=>request.env['HTTP_REFERER'] 
+        :referer=>request.env['HTTP_REFERER']
       }
   end
   def create_runseq(xmain)

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

@@ -4,9 +4,10 @@ class Mindapp::Notice
   include Mongoid::Timestamps
   field :message, :type => String
   field :unread, :type => Boolean
+  field :ip, :type => String
   belongs_to :user
 
-  def self.recent(user_id)
-    where(unread: true, user_id: user_id).last
+  def self.recent(user_id, ip)
+    where(unread: true, user_id: user_id, ip: ip).last
   end
 end

data/lib/mindapp/helpers.rb

@@ -113,10 +113,10 @@ module Mindapp
     def ma_log(message)
       if $user
         Mindapp::Notice.create :message => ERB::Util.html_escape(message.gsub("`","'")),
-          :user_id => $user.id, :unread=> true
+          :user_id => $user.id, :unread=> true, :ip=> env["REMOTE_ADDR"]
       else
         Mindapp::Notice.create :message => ERB::Util.html_escape(message.gsub("`","'")),
-          :unread=> true
+          :unread=> true, :ip=> env["REMOTE_ADDR"]
       end
     end
 

data/lib/mindapp/version.rb

@@ -1,3 +1,3 @@
 module Mindapp
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/tasks/mindapp.rake

@@ -14,6 +14,16 @@ namespace :mindapp do
     gen_views
   end
 
+  desc "generate admin user"
+  task :seed=> :environment do
+    unless Identity.where(code:"admin").exists?
+      identity= Identity.create :code => "admin", :email => "admin@test.com", :password => "secret",
+        :password_confirmation => "secret"
+      User.create :provider => "identity", :uid => identity.id.to_s, :code => identity.code,
+        :email => identity.email, :role => "M,A,D"
+    end
+  end
+
   desc "cancel all pending tasks"
   task :cancel=> :environment do
     Mindapp::Xmain.update_all "status='X'", "status='I' or status='R'"

data/mindapp.gemspec

@@ -16,5 +16,23 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
-  gem.license = 'MIT'
+  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('nokogiri') # for mindapp/doc
+  # gem.add_dependency('haml-rails')
+  # gem.add_dependency('mail')
+  # gem.add_dependency('prawn')
+  # gem.add_dependency('redcarpet')
+  # gem.add_dependency('bcrypt-ruby', '=3.0.0')
+  # gem.add_dependency('omniauth-identity')
+  # gem.add_dependency('cloudinary')
+  # gem.add_dependency('kaminari')
+  # gem.add_development_dependency('debugger')
+  # gem.add_development_dependency('rspec')
+  # gem.add_development_dependency('rspec-rails')
+  # gem.add_development_dependency('better_errors')
+  # gem.add_development_dependency('binding_of_caller')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mindapp
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - songrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-25 00:00:00.000000000 Z
+date: 2013-09-23 00:00:00.000000000 Z
 dependencies: []
 description: generate Ruby on Rails app from mind map
 email: