sinatra-backstage 0.0.1 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8994f18d2816cd1b60ab0d0eaaf902fc3257734d
-  data.tar.gz: 96cf5456d3f53b05660fa121f6764ab1ba42cb48
+  metadata.gz: c9a0c11c57f8f5fff03e397588ad03308f731aa9
+  data.tar.gz: 2781b76ba12acc5952eb021c1414b2cd1fdf4903
 SHA512:
-  metadata.gz: 78f4facabf69816443541ed85e4a75d4221d83e3af0a1206eb980456f677222b9bbef158cd054078877138641e38dd053669ce571189fc31405d036def6dea09
-  data.tar.gz: 66d9b80b2c7f6340e6950cf371f5c094d9af0277c873d26efc9a17ea5a4cf35c020c3ff2ad67174d62ff6e2fc653b5d3540ca7e632e9b90d541dc782114a5e9f
+  metadata.gz: 31210c12c34db4f36c08a325ea392d2878a9af73c9745ae318d50d4bcd0d06f513a86a518dc209ef02d479e042666ae3534d7483292e94bc7bba4275b2a16b19
+  data.tar.gz: 8a17806c06e9f17778e4881e781e984980276868a6a6dd74e4c3357f539cf0ed9223619a7a83ab436663cecd7777cdb22d9ca4001219eaadf8afab5a96197c77

data/lib/sinatra/backstage/rest.rb

@@ -1,5 +1 @@
-Dir.glob(File.join(__dir__, 'rest', '*.rb')).each {|file| require file }
-
-# module Sinatra
-# 	helpers Sinatra::Backstage::REST
-# end
+Dir.glob(File.join(__dir__, 'rest', '*.rb')).each {|file| require file }

data/lib/sinatra/backstage/stored_file.rb

@@ -0,0 +1 @@
+Dir.glob(File.join(__dir__, 'stored_file', '*.rb')).each {|file| require file }

data/lib/sinatra/backstage/stored_file/stored_file_helper.rb

@@ -0,0 +1,18 @@
+module Sinatra
+	module Backstage
+		module StoredFile
+			module Helper
+
+				def get_attachment_attrs(attachment)
+					{
+						:filename => attachment[:filename],
+						:filesize => File.size(attachment[:tempfile].path)
+					}
+				end
+
+			end
+
+			include Helper
+		end
+	end
+end

data/lib/sinatra/backstage/stored_file/stored_file_model.rb

@@ -0,0 +1,91 @@
+## database gems
+require 'dm-core'
+require 'dm-types'
+require 'dm-validations'
+require 'dm-timestamps'
+
+## Stored File class (DataMapper Resource)
+module Sinatra
+	module Backstage
+		module StoredFile
+			class StoredFile
+
+				URL_DIR = "/files"
+				DIR = "/public"
+
+				include DataMapper::Resource
+
+				## Properties
+				property :id, Serial
+				property :filename, String, :required => true
+				property :filesize, Integer, :required => true, :default => 0
+				property :created_at, DateTime, :default => DateTime.now
+
+				default_scope(:default).update(:order => [:created_at.desc])
+
+				def filesize_kb
+					"#{filesize/1024}"
+				end
+
+				def uploaded
+					"#{created_at.strftime('%d %b')}"
+				end
+
+				def self.stored_dir
+					"#{self::DIR + self::URL_DIR}"
+				end
+
+				def stored_filename
+					extname = File.extname(filename)
+					"#{File.basename(filename, extname)}_#{id}#{extname}"
+				end
+
+				def stored_path
+					".#{self.class.stored_dir}/#{stored_filename}"
+				end
+
+				def url
+					"#{self.class::URL_DIR}/#{stored_filename}"
+				end
+
+				## Methods
+				def self.create(attrs, tempfile, extra = {})
+					file = super( attrs.merge extra )
+					write_file(file, tempfile)
+					file
+				rescue DataMapper::SaveFailureError => e
+					puts e.resource.errors.inspect
+				end
+
+				def update(attrs, tempfile, extra = {})
+					delete_file
+					super( attrs.merge extra )
+					self.class.write_file(self, tempfile)
+				rescue DataMapper::SaveFailureError => e
+					puts e.resource.errors.inspect
+				end
+
+				## Hooks
+				before :destroy do
+					delete_file
+				end
+
+
+			protected
+
+				## Helpers
+				def self.write_file(stored_file, tempfile)
+					FileUtils.mkdir_p ".#{stored_dir}" unless Dir.exist? ".#{stored_dir}"
+					File.open(stored_file.stored_path, 'wb') do |f|
+						f.write(tempfile.read)
+					end
+				end
+
+				def delete_file
+					File.delete(stored_path) if File.exist?(stored_path)
+				end
+
+			end
+		end
+	end
+end

data/lib/sinatra/backstage/stored_file/stored_file_routes.rb

@@ -0,0 +1,60 @@
+module Sinatra
+	module Backstage
+		module StoredFile
+			module Routing
+
+				def self.included(controller)
+					controller.extend self
+				end
+
+				def receive_attachment(klass, child_klass, namespace, field_name)
+
+					helpers Sinatra::Backstage::StoredFile::Helper
+
+					## Add logo after create franchise
+					before namespace, :method => :post do
+						if params[:object][field_name]
+							begin
+								attachment = params[:object].delete(field_name)
+								attachment_attrs = get_attachment_attrs(attachment)
+								params[:object][field_name] = child_klass.create(
+									attachment_attrs,
+									attachment[:tempfile]
+								)
+							rescue DataMapper::SaveFailureError => e
+								puts e.resource.errors.inspect
+							end
+						end
+					end
+
+					## Create logo object before update franchise
+					before "#{namespace}/:id", :method => :put do |id|
+						if params[:object][field_name]
+							begin
+								attachment = params[:object].delete(field_name)
+								attachment_attrs = get_attachment_attrs(attachment)
+								klass.get!(id).send(field_name).update(
+									attachment_attrs,
+									attachment[:tempfile]
+								)
+							rescue DataMapper::SaveFailureError => e
+								puts e.resource.errors.inspect
+							end
+						end
+					end
+
+				end
+
+			end
+
+			def self.included(app)
+				app.include Routing
+			end
+
+			def self.registered(app)
+				app.register Routing
+			end
+
+		end
+	end
+end

data/lib/sinatra/backstage/user.rb

@@ -1,5 +1 @@
-Dir.glob(File.join(__dir__, 'user', '*.rb')).each {|file| require file }
-
-# module Sinatra
-# 	register Backstage::User
-# end
+Dir.glob(File.join(__dir__, 'user', '*.rb')).each {|file| require file }

data/lib/sinatra/backstage/user/user_helper.rb

@@ -43,23 +43,22 @@ module Sinatra
 				end
 
 				def authorized?
-					authorized_user.is_a? User
+					authorized_user.role != :anon
 				end
 
 				def authorized_user
 					if @authorized_user.nil?
-						return nil unless cookies[:username] && cookies[:session]
-						user = settings.user_class.first :username => cookies[:username]
-						return nil unless user
-						@authorized_user = (user.session == cookies[:session] ? user : false)
+						if cookies[:username] && cookies[:session]
+							user = settings.user_class.first :username => cookies[:username]
+							if user && user.session == cookies[:session]
+								return @authorized_user = user
+							end
+						end
+						@authorized_user = settings.user_class.new
 					end
 					@authorized_user
 				end
 
-				def user_role
-					authorized? ? :user : :guest
-				end
-
 			end
 
 			include Helper

data/lib/sinatra/backstage/user/user_middleware.rb

@@ -7,12 +7,12 @@ module Sinatra
 			def self.registered(app)
 
 				## Helpers
-				app.helpers Sinatra::Cookies, Backstage::User::Helper
+				app.helpers Sinatra::Cookies, Sinatra::Backstage::User::Helper
 
 				## Configure
 				app.enable :sessions
 				
-				app.set :user_class, Backstage::User::User
+				app.set :user_class, Sinatra::Backstage::User::User
 
 				## Routes
 				### get login page
@@ -30,7 +30,9 @@ module Sinatra
 					# halt
 					@errors = []
 					begin
-						user = settings.user_class.create params[:user]
+						user = settings.user_class.create(
+							params[:user].merge({:role => :user})
+						)
 						set_session user
 						redirect '/'
 					rescue DataMapper::SaveFailureError => e
@@ -41,6 +43,9 @@ module Sinatra
 						end
 						@errors.flatten!
 						puts @errors.inspect
+						params[:user].delete_if do |key, val|
+							['password', 'password_confirmation'].include? key
+						end
 					end
 					# puts "User::Middleware post /signup ( params['user']['email'] = #{params['user']['email']} )"
 					eval "#{settings.render_engine} 'user/signup'"

data/lib/sinatra/backstage/user/user_model.rb

@@ -28,6 +28,9 @@ module Sinatra
 				# 	# self.password_hash = generate_salt_hash(new_password)
 				# 	self.password_hash = new_password
 				# end
+				property :role, Enum[:anon, :user],
+					:required => true,
+					:default => :anon
 
 				def session
 					# generate_salt_hash(username)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-backstage
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.1
 platform: ruby
 authors:
 - Alexander Popov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-18 00:00:00.000000000 Z
+date: 2015-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: sinatra-conditions
+  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: dm-core
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: dm-timestamps
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 description: Sinatra-Backstage simplifies the use of the basic routes and models for
   Sinatra and DataMapper. Currently it includes REST and User.
 email: alex.wayfer@gmail.com
@@ -91,6 +119,10 @@ files:
 - lib/sinatra/backstage/rest.rb
 - lib/sinatra/backstage/rest/rest_model.rb
 - lib/sinatra/backstage/rest/rest_routes.rb
+- lib/sinatra/backstage/stored_file.rb
+- lib/sinatra/backstage/stored_file/stored_file_helper.rb
+- lib/sinatra/backstage/stored_file/stored_file_model.rb
+- lib/sinatra/backstage/stored_file/stored_file_routes.rb
 - lib/sinatra/backstage/user.rb
 - lib/sinatra/backstage/user/user_helper.rb
 - lib/sinatra/backstage/user/user_middleware.rb