caboose-cms 0.3.86 → 0.3.87

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTFiZmFkNWM5MDk2ZTIwOTk5MjMwNWJmMDYxZWEzZjVlNTU5OThmZA==
+    NzU4NmNkZmVkZjE2ZTA2ZDUwYWEwNjlmY2FlZDdkZjhmODYyODViYQ==
   data.tar.gz: !binary |-
-    YjQ0NDAzNjc0YmE0ZjQ5ODUxYmQ5NWRiMDk3YTQ5ZDBjZTI3OTFmNQ==
+    MDM3MTU1NmU1MDFmYWNhNzA1ZTQyMWIzYTExNmE5YzYzNmVhNGEzYw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YzNmN2Y5NTdlMjMyNjNjYTYwZTRmODM1OTc4ZTM4NDhmYzc5YjI0YjQxZThh
-    OWM1OGM4ZGRhNTg3ZWNlOTdlZThmNGM1OWU5ZmU5MWFhNThhOGVlM2M4N2Jl
-    ODQ2NWYwMzJiZTUzZTczZDdjMDUzNDZlOGE0MGU5YmM2MzY4Zjg=
+    YzE5MjJmZjI2MmVhNDVlNWJjYWU2NDY2NzcxOTc5Yjk1MGNhYjg3NDc2ZDky
+    YjZlYmRlNDgyZjMwNWEwY2M3Zjg3NDQ3ZGQyNDQyMWQwMjk4NjkzYTAwNzAw
+    NzExN2M3MDcwOTY4NzM3MDM0OGQ1NDhkNDEzZTEwYTgzNzYyNmQ=
   data.tar.gz: !binary |-
-    Y2IyMmY5MGEyNzBmMzk5YzU0MGM1NjBmYzk3MmUxMGQzMGM0ZWJmN2QxMTIx
-    Y2JjZDlhODA0ZGZhMjIyMWQwYzRhMmM3NTU1ZTE1MzQ0NjZkNGMzZTA2YjFi
-    ODQ5YTkyYzU0NGI1MmI3OGE1OTdlYzlmZGUwN2JlNzI2NTVhZmU=
+    ZDRmNTkxZWQwODNmYzUxNzUzNjQyZTc5ZGRiNzI1OGFkMzQ3YTdlYmFhODZj
+    ZDFlZjM1MWYzOGRmMDg4NDNhMzVlYzgwZDRjODk2YjI1YmJjMTgyN2YyOTA2
+    YmQ3MjkxMjk1NzE0NjgwMjU3Nzg4N2E0Y2E4NTg3Mjg1NzUwMDE=

data/app/controllers/caboose/users_controller.rb

@@ -194,15 +194,18 @@ module Caboose
       })
       
       user = User.new()
-      user.username = params[:username]
+      user.email = params[:email] ? params[:email].strip.downcase : nil
       
-      if (user.username.length == 0)
-        resp.error = "Your username is required."
-      elsif      
+      if user.email.length == 0
+        resp.error = "Please enter a valid email address."
+      elsif User.where(:email => user.email).exists?
+        resp.error = "That email is already in the system."
+      else
         user.save
         resp.redirect = "/admin/users/#{user.id}/edit"
       end
-      render json: resp
+      
+      render :json => resp
     end
     
     # PUT /admin/users/1

data/app/views/caboose/users/new.html.erb

@@ -1,24 +1,33 @@
 
 <h1>New user</h1>
-<div id='user_new_container'></div>
+
+<form action='/admin/users' method='post' id='new_user_form'>
+<input type='hidden' name='authenticity_token' value='<%= form_authenticity_token %>' /> 
+<p><input type='text' name='email' id='email' placeholder='Email' value='' style='width: 400px;' /></p>
+<div id='message'></div>
+<p><input type='submit' value='Add User' /></p>
+</form>
 
 <% content_for :caboose_js do %>
 <script type='text/javascript'>
 
-var user = false;
 $(document).ready(function() {
+  $('#new_user_form').submit(function() { add_user(); return false; });
+});
 
-  user = new Model({
-    name: 'User',
-    id: 'new',
-    listing_url: 'get /admin/users',
-    create_url: 'post /admin/users',
-    attributes: [
-      { name: 'username', type: 'text', value: '' }
-    ]
+function add_user()
+{
+  $('#message').html("<p class='loading'>Adding user...</p>");
+  $.ajax({
+    url: '/admin/users',
+    type: 'post',
+    data: $('#new_user_form').serialize(),
+    success: function(resp) {
+      if (resp.error) $('#message').html("<p class='note error'>" + resp.error + "</p>");
+      if (resp.redirect) window.location = resp.redirect;    
+    }
   });
-  
-});
+}
 
 </script>
 <% end %>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.3.86'
+  VERSION = '0.3.87'
 end

data/lib/tasks/caboose.rake

@@ -70,6 +70,22 @@ namespace :caboose do
     d = DateTime.strptime("04/01/2014 10:00 am -0700", "%m/%d/%Y %I:%M %P %Z")
     puts d
   end
+  
+  desc "Removes duplicate users"
+  task :remove_duplicate_users => :environment do    
+    while true
+      query = ["select email from users group by email having count(email) > ?", 1]    
+      rows = ActiveRecord::Base.connection.select_rows(ActiveRecord::Base.send(:sanitize_sql_array, query))
+      break if rows.nil? || rows.count == 0
+      puts "Deleting #{rows.count} emails..."      
+      query = ["delete from users where id in (
+          select max(A.id) from users A 
+          where A.email in (select email from users B group by B.email having count(B.email) > ?)
+          group by A.email
+        )", 1]
+      ActiveRecord::Base.connection.execute(ActiveRecord::Base.send(:sanitize_sql_array, query))
+    end
+  end
 
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.3.86
+  version: 0.3.87
 platform: ruby
 authors:
 - William Barry
@@ -150,6 +150,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: httparty
+  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'
 description: CMS built on rails with love.
 email:
 - william@nine.is