iatelier 0.4.2 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f94966b5b6ce1b3d0b4af8888299efb172adee30e761b22c592835ede26f2c05
-  data.tar.gz: 6046973762b56a161dd5c90900a0585314e0e9d4eecd8214c3af6d68d254dd55
+  metadata.gz: ef11774e93cc025d29decaaedba45986d004be469934d60057f3f063bec3958c
+  data.tar.gz: 0f6369bfee5d09084dfb0a49db2c17bd34ef21053ae609fe4a993794bc38853c
 SHA512:
-  metadata.gz: ef014861440252ece14e446912eee57018443e6df287b862a26b1353ee6adad3672fcf3f30f5e258db8e7e71b2e93446f91ae23fea2c61c6572d283b3e651034
-  data.tar.gz: b02d2da7679f89bf8c58d1940d9f12fa094c1e0ed336bbab717c17a8cebcdb735c74c089c4733aaf24b54235144546fc90dab86d7546154924464bf708f5c9f8
+  metadata.gz: bb3d0d71d911f5735a11e1f2a281a3f28fea9796d6d538e6c71b0bf0f5b86e22e6643627c7d8864c8cff1695ee3f4a704086ed5c6f2bd9789f86666f34ae9c0f
+  data.tar.gz: 1224abfc23f59ebd076f1fa55714ad991d43e9ea385b47f2699174ba9cf04db795c6814c71dcd162484ac5a140b8764bbb53c577b8df4f97659d4911d21cac98

data/iatelier.gemspec

@@ -40,4 +40,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.9"
   spec.add_development_dependency "hanami", "~> 1.3"
   spec.add_runtime_dependency "redcarpet", "~>3.5"
+  spec.add_runtime_dependency "mime-types", "~>3.3"
 end

data/lib/iatelier/controllers/books/_db_connector.rb

@@ -4,10 +4,12 @@ module Iatelier
 			module DbConnector
 				def set_database database
 					tmp_config = ActiveRecord::Base.connection_config
-					tmp_config[:database] = database
-					ActiveRecord::Base.establish_connection tmp_config
+					if !database.nil?
+						tmp_config[:database] = database
+						ActiveRecord::Base.establish_connection tmp_config
+					end
 				end
 			end
 		end
 	end
-end
+end

data/lib/iatelier/controllers/books/create.rb

@@ -4,11 +4,46 @@ module Iatelier
       class Create
         include Iatelier::Action
 		include Iatelier::Controllers::Books::DbConnector
+        expose :book, :book_type, :database, :errors
         def call(params)
-	        self.set_database params[:database]
+            # [optional] setting the database
+            @database = params.get(:database)
+	        self.set_database @database
+
+            #
 			@book = Object.const_get(params[:book_type].capitalize).new
-			@book.save
-			@book.create(params)
+            @book.namespace = database
+
+            # p 'starting everything'
+            @book.dimensions.each do |dimension|
+                method_name = 'setup_' + dimension
+                action = @book.public_send(method_name.to_sym, params)
+                p 'what is the status = ' + action.valid?.to_s
+                if !action.valid?
+                    puts 'the error is ' + action.errors.messages.to_s
+                    @errors = action.errors.messages
+                    self.status = 422
+                    return 'caught an error!'
+                end
+            end
+
+            @book.save
+
+            @book.dimensions.each do |dimension|
+                action = @book.public_send(dimension.to_sym)
+    			if !action.save
+                    @errors = action.errors.messages
+                    self.status = 422
+                    return 'caught an error!'
+                end
+    		end
+
+            @book.sync_keywords params
+    		@book.sync_individuals params
+    		@book.sync_content params
+    		@book.store_attachment params
+
+            redirect_to '/iatelier/' + @database + '/' + params[:book_type]
         end
       end
     end

data/lib/iatelier/controllers/books/edit.rb

@@ -6,10 +6,13 @@ module Iatelier
         include Iatelier::Controllers::Books::DbConnector
 		expose :book, :database
         def call(params)
-	        @database = params[:database]
-	        self.set_database database
+            # [optional] setting the database
+            @database = params.get(:database)
+	        self.set_database @database
+
+            #
 	        @book = Object.const_get(params[:book_type].capitalize).find(params[:id])
-	        @book.namespace = @database
+            @book.namespace = @database
         end
       end
     end

data/lib/iatelier/controllers/books/manage.rb

@@ -4,10 +4,17 @@ module Iatelier
       class Manage
         include Iatelier::Action
         include Iatelier::Controllers::Books::DbConnector
-		expose :books
+		expose :books, :uri
         def call(params)
-	        self.set_database params[:database]
-	        @books = Object.const_get(params[:book_type].capitalize).all
+            # [optional] setting the database
+            @database = params.get(:database)
+            self.set_database @database
+
+            #
+	        @books = Object.const_get(params[:book_type].capitalize).includes(:timestamp).all.order("timestamps.publish desc")
+
+            #
+            @uri = '/iatelier/' + @database + '/' + params[:book_type] + '/'
         end
       end
     end

data/lib/iatelier/controllers/books/new.rb

@@ -6,8 +6,10 @@ module Iatelier
         include Iatelier::Controllers::Books::DbConnector
 		expose :book, :book_type, :database
         def call(params)
-	        @database = params[:database]
-	        self.set_database database
+            # [optional] setting the database
+            @database = params.get(:database)
+            self.set_database @database
+            
 	        @book_type = params[:book_type].capitalize;
 	        @book = Object.const_get(@book_type).new
 	        @book.namespace = @database
@@ -15,4 +17,4 @@ module Iatelier
       end
     end
   end
-end
+end

data/lib/iatelier/controllers/books/update.rb

@@ -4,12 +4,35 @@ module Iatelier
       class Update
         include Iatelier::Action
 		include Iatelier::Controllers::Books::DbConnector
+        expose :book, :database, :errors
         def call(params)
-	        self.set_database params[:database]
+            # [optional] setting the database
+            @database = params.get(:database)
+	        self.set_database @database
+
+            # setting up the book
 	        @book = Object.const_get(params[:book_type].capitalize).find(params[:id])
-			@book.revise(params)
-			@book.save
-			self.body = @book.save.to_json
+            @book.namespace = @database
+
+            @book.dimensions.each do |dimension|
+    			if @book.public_send(dimension.to_sym)
+    				method_name = 'revise_' + dimension
+    			else
+    				method_name = 'setup_' + dimension
+    			end
+    			@book.public_send(method_name.to_sym, params)
+    		end
+    		@book.dimensions.each do |dimension|
+                action = @book.public_send(dimension.to_sym)
+    			if !action.save
+                    @errors = action.errors.messages
+                    self.status = 422
+                end
+    		end
+    		@book.sync_keywords params
+    		@book.sync_individuals params
+    		@book.sync_content params
+    		@book.store_attachment params
         end
       end
     end

data/lib/iatelier/models/book.rb

@@ -5,10 +5,6 @@ class Book < ActiveRecord::Base
 	DIMENSIONS = []
 	GROUPINGS = []
 	ROLES = []
-	
-	@content_raw = ''
-	
-	@namespace = nil
 
 	has_one :title, as: :titleable, class_name: 'Dimensions::Title'
 	has_one :slug, as: :slugable, class_name: 'Dimensions::Slug'
@@ -22,23 +18,22 @@ class Book < ActiveRecord::Base
 
 	has_many :peopleables, as: :peopleable, dependent: :destroy
 	has_many :peoples, through: :peopleables
-	
+
 	has_many :bundleables, as: :bundleable, dependent: :destroy
 	has_many :bundles, through: :bundleables
-	
+
 	accepts_nested_attributes_for :title, :slug, :subtitle, :description, :thumbnail, :timestamp
 	validates_associated :slug
-	
+
 	attr_accessor :namespace
 
-	
 	def kind
 		self.class.to_s
 	end
 	def uniq
 		self.class.to_s + self.id.to_s
 	end
-	
+
 	def dimensions
 		self.class::DIMENSIONS
 	end
@@ -53,66 +48,24 @@ class Book < ActiveRecord::Base
 		@query = '`peopleables`.`role` = "' + requested_role.to_s + '"'
 		self.peoples.includes(:peopleables).where(@query)
 	end
-	
+
 	def content_raw
-		puts 'trying to open content'
 		unless self.id.nil?
-			puts 'id passed'
 			path = Iatelier.configuration.storage_dir + @namespace.to_s + self.class.name.downcase + '/' + self.id.to_s + '/main.md'
-			puts 'path is set to ' + path
+			puts 'triving to retrive the content from the path = ' + path.to_s
 			if File.exists? path
-				puts 'reading content'
-				@content = File.open(path).read
+				return File.open(path).read
 			else
-				@content = nil
+				return nil
 			end
 		else
-			@content = nil
+			return nil
 		end
 	end
-	
+
 	def content
 		markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML, autolink: true, tables: true)
-		markdown.render(self.content_raw)
-	end
-
-# 	def initialized
-# 		super()
-# 		puts "content of the dimension: \n"
-# 		puts dimensions.inspect
-# 		dimensions.each do |dimension|
-# 			reference = dimension + able
-# 			hasone dimension.to_sym as: reference.to_sym
-# 		end
-# 	end
-
-	def create params
-		puts 'these are the stuff were going to add:' + dimensions.to_s
-		dimensions.each do |dimension|
-			method_name = 'setup_' + dimension
-			self.public_send(method_name.to_sym, params)
-		end
-		self.save
-		sync_keywords params
-		sync_individuals params
-		sync_content params
-	end
-
-	def revise params
-		dimensions.each do |dimension|
-			if self.public_send(dimension.to_sym)
-				method_name = 'revise_' + dimension
-			else
-				method_name = 'setup_' + dimension
-			end
-			self.public_send(method_name.to_sym, params)
-		end
-		dimensions.each do |dimension|
-			self.public_send(dimension.to_sym).save
-		end
-		sync_keywords params
-		sync_individuals params
-		sync_content params
+		return markdown.render(content_raw.to_s.force_encoding(Encoding::UTF_8))
 	end
 
 	def sync_keywords params
@@ -172,31 +125,38 @@ class Book < ActiveRecord::Base
 	end
 
 	def setup_title params
-		self.build_title({value: params[:title]})
+		return self.build_title({value: params[:title]})
 	end
 	def revise_title params
-		self.title.update(value: params[:title])
+		return self.title.update(value: params[:title])
 	end
-	
+
 	def setup_subtitle params
-		self.build_subtitle({value: params[:subtitle]})
+		return self.build_subtitle({value: params[:subtitle]})
 	end
 	def revise_subtitle params
-		self.subtitle.update(value: params[:subtitle])
+		return self.subtitle.update(value: params[:subtitle])
 	end
 
 	def setup_slug params
-		self.build_slug({value: params[:slug]})
+		return self.build_slug({value: params[:slug]})
 	end
 	def revise_slug params
-		self.slug.update(value: params[:slug])
+		return self.slug.update(value: params[:slug])
+	end
+
+	def setup_description params
+		self.build_description({value: params[:description]})
 	end
-	
+	def revise_description params
+		self.description.update(value: params[:description])
+	end
+
 	def setup_thumbnail params
 	end
 	def revise_thumbnail params
 	end
-	
+
 	def setup_timestamp params
 		puts 'setting up timestamp'
 		self.build_timestamp({
@@ -219,10 +179,9 @@ class Book < ActiveRecord::Base
 			self.setup_timestamp params
 		end
 	end
-	
+
 	def sync_content params
-		puts 'we are trying to sync the content = ' + params[:content]
-		path = Iatelier.configuration.storage_dir + params[:database].to_s + self.class.name.downcase + '/' + self.id.to_s
+		path = Iatelier.configuration.storage_dir + @namespace.to_s + self.class.name.downcase + '/' + self.id.to_s
 		Dir.mkdir(path) unless File.exists?(path)
 		File.open(path + '/main.md', 'w+') do |file|
 			file.puts params[:content]
@@ -232,4 +191,18 @@ class Book < ActiveRecord::Base
 		self.save
 		puts self.loc.to_s
 	end
-end
+
+	def store_attachment params
+		path = Iatelier.configuration.storage_dir + @namespace.to_s + self.class.name.downcase + '/' + self.id.to_s + '/'
+		if !params.get(:file).nil?
+			Dir.mkdir(path) unless File.exists?(path)
+			File.open(path + params[:file][:filename], 'wb') do |file|
+				file.write params[:file][:tempfile].read
+			end
+		end
+	end
+	def get_asset params
+		path = Iatelier.configuration.storage_dir + @namespace.to_s + self.class.name.downcase + '/' + self.id.to_s + '/'
+		return File.open(path + params[:asset], 'r')
+	end
+end

data/lib/iatelier/templates/books/_engine.html.haml

@@ -1,4 +1,10 @@
 .panel-edit
+	- if @locals.include?(:errors)
+		.form-box
+			.os-form-group
+				- errors.each do |value, key|
+					%p= value
+					%p= key
 	.form-box
 		.os-form-group
 			-if book.dimensions.include? 'title'
@@ -16,6 +22,9 @@
 			-if book.dimensions.include? 'description'
 				%label.label Description
 				%input{:class => "form-control pure-input-1", :name => "description", :type => "text", :placeholder => "Description", :value => book.description.try(:value)}
+		.os-form-group
+			%label.label Attachments
+			%input{:type => 'file', :id => 'file', :name => 'file'}
 	.form-box
 		%label Text
 		%br
@@ -31,4 +40,3 @@
 		= render :partial => 'grouping/bundles'
 	.form-box
 		= render :partial => 'dimension/timestamp'
-		

data/lib/iatelier/templates/books/edit.html.haml

@@ -1,5 +1,4 @@
 %div
-	.todo adding errors here!
 	%form{:class => "atelier-main-form pure-form pure-form-aligned", :action => "/iatelier/#{database}/#{book.class.name.downcase}/#{book.id}", :method => "POST",  :enctype => "multipart/form-data"}
 		.form-actions
 			<button type="submit" class="btn btn-default">Edit</button>

data/lib/iatelier/templates/books/manage.html.haml

@@ -8,5 +8,7 @@
 	- books.each do |book|
 		%tr
 			%td= book.id
-			%td= book.title.value
+			%td
+				%a{href: uri + book.id.to_s + '/edit' }
+					= book.title.value
 			%td= book.slug.try(:value)

data/lib/iatelier/templates/books/new.html.haml

@@ -1,6 +1,5 @@
 %div
-	.todo adding errors here!
 	%form{:class => "atelier-main-form pure-form pure-form-aligned", :action => "/iatelier/#{database}/#{book.class.name.downcase}/#{book.id}", :method => "POST",  :enctype => "multipart/form-data"}
 		.form-actions
 			<button type="submit" class="btn btn-default">Create</button>
-		= render :partial => 'engine'
+		= render :partial => 'engine'

data/lib/iatelier/version.rb

@@ -1,3 +1,3 @@
 module Iatelier
-  VERSION = "0.4.2"
+  VERSION = "0.5.2"
 end

data/lib/iatelier/views/books/create.rb

@@ -3,6 +3,7 @@ module Iatelier
     module Books
       class Create
         include Iatelier::View
+        template 'books/new'
       end
     end
   end

data/lib/iatelier/views/books/manage.rb

@@ -3,6 +3,9 @@ module Iatelier
     module Books
       class Manage
         include Iatelier::View
+        def uri
+            raw locals[:uri]
+        end
       end
     end
   end

data/lib/iatelier/views/books/update.rb

@@ -3,6 +3,7 @@ module Iatelier
     module Books
       class Update
         include Iatelier::View
+        template 'books/edit'
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iatelier
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.2
 platform: ruby
 authors:
 - Captain Husayn Pinguin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-26 00:00:00.000000000 Z
+date: 2020-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
 description: iAtelier, a simple, yet powerful CMS engine for Hanami
 email:
 - captainhusaynpinguin@galacticvisions.xyz
@@ -141,7 +155,6 @@ files:
 - lib/iatelier/templates/books/grouping/_peoples.html.haml
 - lib/iatelier/templates/books/manage.html.haml
 - lib/iatelier/templates/books/new.html.haml
-- lib/iatelier/templates/books/update.html.haml
 - lib/iatelier/version.rb
 - lib/iatelier/views/application_layout.rb
 - lib/iatelier/views/books/create.rb